- release 2 (libvpx 1.14)

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

diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 47dd1a5630fb5163f32c9b33bc866a90a08e3901..df158e76bc5ba7e91076165d46e987bda5ec4157 100644 (file)
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,25 +1,22 @@
---- avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp.orig     2015-10-19 19:08:06.986346394 +0200
-+++ avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp  2015-10-19 19:41:57.745216176 +0200
-@@ -61,7 +61,7 @@
-  int eax, ebx, ecx, edx;
-  int max_std_level, max_ext_level;
+--- 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)
  
--#if !defined(ADM_CPU_64BIT) // 64 bits CPU have all cpuid
-+#if !defined(ADM_CPU_X86_64) // x86_64 CPUs have all cpuid
-  long a, c;
+     MESSAGE(STATUS "Configuring done, processing")
  
-  __asm__ __volatile__ (
---- avidemux_2.6.10/cmake/admFFmpegBuild.cmake.orig    2015-10-19 20:07:00.923333350 +0200
-+++ avidemux_2.6.10/cmake/admFFmpegBuild.cmake 2015-10-19 20:34:06.114456242 +0200
-@@ -259,7 +259,7 @@
+-    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}")
  
-       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_YASM[ ]+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 @@
@@ -31,3 +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.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)
++        IF( ADM_CPU_64BIT )
++            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)
++        ENDIF( ADM_CPU_64BIT )
+     ELSE( ADM_CPU_X86_64 )
+         SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1)
+     ENDIF( ADM_CPU_X86_64 )