]>
Commit | Line | Data |
---|---|---|
162737ed JB |
1 | --- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig 2021-07-04 06:48:04.541811758 +0200 |
2 | +++ avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake 2021-07-04 06:50:47.746939993 +0200 | |
3 | @@ -286,14 +286,14 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE) | |
7d9ea41d JB |
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) | |
162737ed | 10 | string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}") |
7d9ea41d | 11 | |
162737ed JB |
12 | if (NOT FF_YASM) |
13 | message(FATAL_ERROR "Yasm was not found.") | |
14 | endif (NOT FF_YASM) | |
15 | - endif (ADM_CPU_X86) | |
16 | + endif () | |
17 | ||
18 | execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil" | |
19 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config") | |
270e1395 JB |
20 | --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig 2015-10-19 20:34:26.862201138 +0200 |
21 | +++ avidemux_2.6.10/cmake/admInstallDir.cmake 2015-10-19 21:15:45.397657233 +0200 | |
22 | @@ -20,6 +20,8 @@ | |
23 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib64) | |
24 | ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)") | |
25 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib32) | |
26 | + ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/libx32([; ]|$)") | |
27 | + SET(AVIDEMUX_RELATIVE_LIB_DIR libx32) | |
28 | ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") | |
29 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib) | |
30 | ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") | |
1692a186 JB |
31 | --- avidemux_2.7.8/cmake/admYasm_gcc.cmake.orig 2021-07-03 20:36:14.136607549 +0200 |
32 | +++ avidemux_2.7.8/cmake/admYasm_gcc.cmake 2021-07-03 20:40:46.251800041 +0200 | |
33 | @@ -34,7 +34,11 @@ IF(ADM_CPU_X86 ) | |
0e001267 JB |
34 | |
35 | ||
36 | IF( ADM_CPU_X86_64 ) | |
1692a186 | 37 | - SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0) |
0e001267 | 38 | + IF( ADM_CPU_64BIT ) |
cb1eb26f | 39 | + SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0) |
0e001267 | 40 | + ELSE( ADM_CPU_64BIT ) |
cb1eb26f | 41 | + SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0) |
0e001267 JB |
42 | + ENDIF( ADM_CPU_64BIT ) |
43 | ELSE( ADM_CPU_X86_64 ) | |
1692a186 | 44 | SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -DARCH_X86_64=0 -DARCH_X86_32=1) |
0e001267 | 45 | ENDIF( ADM_CPU_X86_64 ) |