commit 270e1395724332952eadbb092c633fc29f69a3b9
Author: Jakub Bogusz <[email protected]>
Date: Mon Oct 19 21:43:36 2015 +0200
- added x32 patch, disable asm in internal ffmpeg
avidemux-x32.patch | 33 +++++++++++++++++++++++++++++++++
avidemux.spec | 5 +++++
2 files changed, 38 insertions(+)
---
diff --git a/avidemux.spec b/avidemux.spec
index 6888ec3..fd20233 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -31,6 +31,7 @@ Source3: %{name}-qt5.desktop
Patch0: build.patch
Patch1: no-qt-in-gtk.patch
Patch2: gtk-build.patch
+Patch3: %{name}-x32.patch
URL: http://fixounet.free.fr/avidemux/
%{?with_qt5:BuildRequires: Qt5Gui-devel >= %{qt5_version}}
# not used due to minor>=5 check incmake/admCheckOpenGl.cmake
@@ -150,6 +151,7 @@ find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o
-name '*.cmake' -o -nam
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
echo 'pt_BR' >> po/LINGUAS
@@ -166,6 +168,9 @@ cd buildCore
%cmake \
-DAVIDEMUX_SOURCE_DIR=$AVIDEMUX_SOURCE_DIR \
-DFAKEROOT=$FAKEROOT_DIR \
+%ifarch x32
+ -DFF_FLAGS="--disable-asm" \
+%endif
../avidemux_core
%{__make} -j1
%{__make} install DESTDIR=$FAKEROOT_DIR
diff --git a/avidemux-x32.patch b/avidemux-x32.patch
new file mode 100644
index 0000000..47dd1a5
--- /dev/null
+++ b/avidemux-x32.patch
@@ -0,0 +1,33 @@
+--- 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;
+
+-#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;
+
+ __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 @@
+
+ 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 @@
+ SET(AVIDEMUX_RELATIVE_LIB_DIR lib64)
+ ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)")
+ SET(AVIDEMUX_RELATIVE_LIB_DIR lib32)
++ ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/libx32([; ]|$)")
++ SET(AVIDEMUX_RELATIVE_LIB_DIR libx32)
+ ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
+ SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
+ ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/270e1395724332952eadbb092c633fc29f69a3b9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
