- release 2 (libvpx 1.14)

[packages/avidemux.git] / avidemux-x32.patch

diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 5350ce45f828c353b77a021647dfb23766067313..df158e76bc5ba7e91076165d46e987bda5ec4157 100644 (file)
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,3 +1,22 @@
+--- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig     2021-07-04 06:48:04.541811758 +0200
++++ avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake  2021-07-04 06:50:47.746939993 +0200
+@@ -286,14 +286,14 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)
+ 
+     MESSAGE(STATUS "Configuring done, processing")
+ 
+-    if (ADM_CPU_X86)
++    if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT))
+         file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
+         string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+ 
+         if (NOT FF_YASM)
+             message(FATAL_ERROR "Yasm was not found.")
+         endif (NOT FF_YASM)
+-    endif (ADM_CPU_X86)
++    endif ()
+ 
+     execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil"
+                     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config")
 --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig     2015-10-19 20:34:26.862201138 +0200
 +++ avidemux_2.6.10/cmake/admInstallDir.cmake  2015-10-19 21:15:45.397657233 +0200
 @@ -20,6 +20,8 @@
@@ -9,18 +28,18 @@
          ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
          ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
---- avidemux_2.7.0/cmake/admYasm_gcc.cmake.orig        2017-12-24 14:39:56.979737709 +0100
-+++ avidemux_2.7.0/cmake/admYasm_gcc.cmake     2017-12-25 09:22:40.292301873 +0100
-@@ -39,7 +39,11 @@
+--- avidemux_2.7.8/cmake/admYasm_gcc.cmake.orig        2021-07-03 20:36:14.136607549 +0200
++++ avidemux_2.7.8/cmake/admYasm_gcc.cmake     2021-07-03 20:40:46.251800041 +0200
+@@ -34,7 +34,11 @@ IF(ADM_CPU_X86 )
        
       
      IF( ADM_CPU_X86_64 )
--        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
+-        SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0)
 +        IF( ADM_CPU_64BIT )
-+            SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
++            SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0)
 +        ELSE( ADM_CPU_64BIT )
-+            SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0")
++            SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0)
 +        ENDIF( ADM_CPU_64BIT )
      ELSE( ADM_CPU_X86_64 )
-         SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1")
+         SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1)
      ENDIF( ADM_CPU_X86_64 )