rpms/avidemux/devel avidemux-2.6.7-libva.patch, NONE, 1.1 avidemux.spec, 1.87, 1.88
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28011
Modified Files:
avidemux.spec
Added Files:
avidemux-2.6.7-libva.patch
Log Message:
Add patch for libva i686 build.
avidemux-2.6.7-libva.patch:
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE avidemux-2.6.7-libva.patch ---
diff --git a/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt
b/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt
index e8c1af4..7d6f33e 100644
--- a/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt
+++ b/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt
@@ -8,4 +8,5 @@ ADM_ADD_SHARED_LIBRARY(ADM_coreLibVA6 ${ADM_libva_SRCS})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ADM_coreLibVA/include)
TARGET_LINK_LIBRARIES(ADM_coreLibVA6 va va-x11)
TARGET_LINK_LIBRARIES(ADM_coreLibVA6 ADM_core6 ADM_coreUI6 ADM_coreImage6)
+TARGET_LINK_LIBRARIES(ADM_coreLibVA6 "c")
ADM_INSTALL_LIB(ADM_coreLibVA6)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- avidemux.spec 27 Jan 2014 17:48:57 -0000 1.87
+++ avidemux.spec 28 Jan 2014 01:58:27 -0000 1.88
@@ -15,6 +15,7 @@
Patch1: avidemux-2.6-bundled_libs.patch
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+Patch4: avidemux-2.6.7-libva.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -92,6 +93,7 @@
Summary: Libraries for %{name}
Group: System Environment/Libraries
#Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: avidemux-devel < 2.6.4-9
%description libs
This package contains the runtime libraries for %{name}.
@@ -145,6 +147,7 @@
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
%patch3 -p1 -b .bund_libs2
+%patch4 -p1 -b .libva
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -364,7 +367,7 @@
%changelog
* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
- Update to latest upstream release.
-- Drop unneeded devel subpackage.
+- Obsolete unneeded devel subpackage.
* Tue Nov 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.4-8
- Rebuilt for x264/FFmpeg