[packages/avidemux] - ffmpeg fix in x32 patch
qboosh
qboosh at pld-linux.org
Tue Dec 26 18:30:37 CET 2017
commit 7d9ea41d71d4faba1b0aaea1028559facc2e7a93
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Dec 26 18:32:07 2017 +0100
- ffmpeg fix in x32 patch
avidemux-x32.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 5350ce4..e23a8fc 100644
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,3 +1,14 @@
+--- avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake.orig 2015-10-19 20:07:00.923333350 +0200
++++ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake 2015-10-19 20:34:06.114456242 +0200
+@@ -259,7 +259,7 @@
+
+ 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}")
+
--- 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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/7d9ea41d71d4faba1b0aaea1028559facc2e7a93
More information about the pld-cvs-commit
mailing list