SPECS: ffmpeg.spec - added link patch, fixes build with --as-neede...
qboosh
qboosh at pld-linux.org
Sat Dec 9 16:19:38 CET 2006
Author: qboosh Date: Sat Dec 9 15:19:38 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added link patch, fixes build with --as-needed
- build swscale lib
---- Files affected:
SPECS:
ffmpeg.spec (1.118 -> 1.119)
---- Diffs:
================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.118 SPECS/ffmpeg.spec:1.119
--- SPECS/ffmpeg.spec:1.118 Sat Dec 9 15:50:03 2006
+++ SPECS/ffmpeg.spec Sat Dec 9 16:19:33 2006
@@ -2,7 +2,6 @@
# TODO
# - libtool patch breaks linked libs (-Wl,as-needed inside configure and Makefiles broken)
# - libnut enabled no
-# - Software Scaler enabled no
#
# Conditional build:
%bcond_with amr # build 3GPP Adaptive Multi Rate (AMR) speech codec
@@ -30,6 +29,7 @@
Source2: ffserver.sysconfig
Source3: ffserver.conf
#Patch0: %{name}-libtool.patch
+Patch0: %{name}-link.patch
Patch1: %{name}-libdir.patch
Patch2: %{name}-gcc4.patch
Patch3: %{name}-system-amr.patch
@@ -209,7 +209,7 @@
%prep
%setup -q -n %{name}-export-%{_snap}
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
#%patch3 -p1 NEEDS UPDATE
@@ -240,6 +240,7 @@
--enable-pp \
--enable-pthreads \
--enable-shared \
+ --enable-swscaler \
--enable-vorbis \
--enable-x264 \
--enable-xvid \
@@ -319,6 +320,7 @@
%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
%attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
+%attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
%dir %{_libdir}/vhook
%attr(755,root,root) %{_libdir}/vhook/drawtext.so
%attr(755,root,root) %{_libdir}/vhook/fish.so
@@ -333,6 +335,7 @@
%attr(755,root,root) %{_libdir}/libavformat.so
%attr(755,root,root) %{_libdir}/libavutil.so
%attr(755,root,root) %{_libdir}/libpostproc.so
+%attr(755,root,root) %{_libdir}/libswscale.so
#%{_libdir}/lib*.la
%{_includedir}/ffmpeg
%{_includedir}/postproc
@@ -369,6 +372,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.119 2006/12/09 15:19:33 qboosh
+- added link patch, fixes build with --as-needed
+- build swscale lib
+
Revision 1.118 2006/12/09 14:50:03 qboosh
- added CVE reference (ffmpeg < 20060530 was vulnerable to CVE-2006-4800)
- AVISynth is Win32-only (uses WinAPI), mediaLib is Solaris-only
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.118&r2=1.119&f=u
More information about the pld-cvs-commit
mailing list