avidemux-x32.patch

   1 --- avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp.orig      2015-10-19 19:08:06.986346394 +0200
   2 +++ avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp   2015-10-19 19:41:57.745216176 +0200
   3 @@ -61,7 +61,7 @@
   4   int eax, ebx, ecx, edx;
   5   int max_std_level, max_ext_level;
   6
   7 -#if !defined(ADM_CPU_64BIT) // 64 bits CPU have all cpuid
   8 +#if !defined(ADM_CPU_X86_64) // x86_64 CPUs have all cpuid
   9   long a, c;
  10
  11   __asm__ __volatile__ (
  12 --- avidemux_2.6.10/cmake/admFFmpegBuild.cmake.orig     2015-10-19 20:07:00.923333350 +0200
  13 +++ avidemux_2.6.10/cmake/admFFmpegBuild.cmake  2015-10-19 20:34:06.114456242 +0200
  14 @@ -259,7 +259,7 @@
  15
  16         MESSAGE(STATUS "Configuring done, processing")
  17
  18 -       if (ADM_CPU_X86)
  19 +       if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT))
  20                 file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
  21                 string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
  22
  23 --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig      2015-10-19 20:34:26.862201138 +0200
  24 +++ avidemux_2.6.10/cmake/admInstallDir.cmake   2015-10-19 21:15:45.397657233 +0200
  25 @@ -20,6 +20,8 @@
  26                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib64)
  27          ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)")
  28                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib32)
  29 +        ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/libx32([; ]|$)")
  30 +                SET(AVIDEMUX_RELATIVE_LIB_DIR libx32)
  31          ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
  32                  SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
  33          ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
  34 --- avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake.orig   2016-01-31 10:54:01.427419625 +0100
  35 +++ avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake        2016-01-31 14:09:36.528371876 +0100
  36 @@ -10,7 +10,11 @@
  37      if(APPLE)
  38          set(ARGS -f macho64 -m amd64 -DPREFIX)
  39      elseif(UNIX AND NOT CYGWIN)
  40 +      if(ADM_CPU_64BIT)
  41          set(ARGS -f elf64 -m amd64)
  42 +      else(ADM_CPU_64BIT)
  43 +        set(ARGS -f elfx32 -m x32)
  44 +      endif(ADM_CPU_64BIT)
  45      else()
  46          set(ARGS -f win64 -m amd64)
  47      endif()