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

diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 47dd1a5630fb5163f32c9b33bc866a90a08e3901..ad667b6d720e005f64fb03f3f9ee42e358b6fae5 100644 (file)
--- 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()