avidemux-x32.patch

   1 --- avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake.orig     2015-10-19 20:07:00.923333350 +0200
   2 +++ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake  2015-10-19 20:34:06.114456242 +0200
   3 @@ -259,7 +259,7 @@
   4
   5      MESSAGE(STATUS "Configuring done, processing")
   6
   7 -    if (ADM_CPU_X86)
   8 +    if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT))
   9          file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
  10          string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
  11
  12 --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig      2015-10-19 20:34:26.862201138 +0200
  13 +++ avidemux_2.6.10/cmake/admInstallDir.cmake   2015-10-19 21:15:45.397657233 +0200
  14 @@ -20,6 +20,8 @@
  15                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib64)
  16          ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)")
  17                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib32)
  18 +        ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/libx32([; ]|$)")
  19 +                SET(AVIDEMUX_RELATIVE_LIB_DIR libx32)
  20          ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
  21                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
  22          ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
  23 --- avidemux_2.7.0/cmake/admYasm_gcc.cmake.orig 2017-12-24 14:39:56.979737709 +0100
  24 +++ avidemux_2.7.0/cmake/admYasm_gcc.cmake      2017-12-25 09:22:40.292301873 +0100
  25 @@ -39,7 +39,11 @@
  26
  27
  28      IF( ADM_CPU_X86_64 )
  29 -        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
  30 +        IF( ADM_CPU_64BIT )
  31 +            SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
  32 +        ELSE( ADM_CPU_64BIT )
  33 +            SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0")
  34 +        ENDIF( ADM_CPU_64BIT )
  35      ELSE( ADM_CPU_X86_64 )
  36          SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1")
  37      ENDIF( ADM_CPU_X86_64 )