[packages/avidemux] - enhanced x32 patch (fix for yasm usage in internal libass)

qboosh qboosh at pld-linux.org
Sun Jan 31 17:36:26 CET 2016


commit 1f3ab92861d7a6bc24dc9862a6516112956041f8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 31 17:38:51 2016 +0100

    - enhanced x32 patch (fix for yasm usage in internal libass)

 avidemux-x32.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
---
diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 47dd1a5..ad667b6 100644
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -31,3 +31,17 @@
          ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
          ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
+--- avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake.orig	2016-01-31 10:54:01.427419625 +0100
++++ avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake	2016-01-31 14:09:36.528371876 +0100
+@@ -10,7 +10,11 @@
+     if(APPLE)
+         set(ARGS -f macho64 -m amd64 -DPREFIX)
+     elseif(UNIX AND NOT CYGWIN)
++      if(ADM_CPU_64BIT)
+         set(ARGS -f elf64 -m amd64)
++      else(ADM_CPU_64BIT)
++        set(ARGS -f elfx32 -m x32)
++      endif(ADM_CPU_64BIT)
+     else()
+         set(ARGS -f win64 -m amd64)
+     endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/1f3ab92861d7a6bc24dc9862a6516112956041f8



More information about the pld-cvs-commit mailing list