packages: ffmpeg/ffmpeg.spec, ffmpeg/ffmpeg-bug-803.patch (REMOVED)=?UTF-8?Q?=20?=- up to...

qboosh qboosh at pld-linux.org
Tue Jun 5 15:47:22 CEST 2012 

Author: qboosh                       Date: Tue Jun  5 13:47:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.11 (note: new libav{codec,device,format} sonames; ffmpeg 0.10.x on FFMPEG_0_10 branch); fixes
  CVE-2012-2772 CVE-2012-2774 CVE-2012-2775 CVE-2012-2776 CVE-2012-2777
  CVE-2012-2779 CVE-2012-2782 CVE-2012-2783 CVE-2012-2784 CVE-2012-2785
  CVE-2012-2786 CVE-2012-2787 CVE-2012-2788 CVE-2012-2789 CVE-2012-2790
  CVE-2012-2791 CVE-2012-2792 CVE-2012-2793 CVE-2012-2794 CVE-2012-2795
  CVE-2012-2796 CVE-2012-2797 CVE-2012-2798 CVE-2012-2799 CVE-2012-2800
  CVE-2012-2801 CVE-2012-2802 CVE-2012-2803 CVE-2012-2804
- removed outdated bug-803 patch
- introduced libavresample library
- no longer uses libdirac, only native dirac decoder
- test release 0.1

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.251 -> 1.252) , ffmpeg-bug-803.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.251 packages/ffmpeg/ffmpeg.spec:1.252
--- packages/ffmpeg/ffmpeg.spec:1.251	Wed May  9 15:39:50 2012
+++ packages/ffmpeg/ffmpeg.spec	Tue Jun  5 15:47:17 2012
@@ -1,10 +1,7 @@
 # $Revision$, $Date$
-# TODO
-# - is bug803 patch still needed? the code changed somehow
 #
-# Workaround ffmpeg.spec & opencv.spec updating:
-#
-# 	1. make-request -r --without opencv ffmpeg.spec
+# How to deal with ffmpeg/opencv checken-egg problem:
+#	1. make-request -r --without opencv ffmpeg.spec
 #	2. make-request -r opencv.spec
 #	3. bump release of ffmpeg.spec
 #	4. make-request -r ffmpeg.spec
@@ -26,27 +23,25 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	0.10.3
-Release:	1
+Version:	0.11
+Release:	0.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
 License:	GPL v3+ with LGPL v3+ parts
 Group:		Applications/Multimedia
 Source0:	http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	775d184933f71ff44a2fff4968e78b2b
+# Source0-md5:	101e1092582bbfca8f2a204cbcecb8fc
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-Patch0:		%{name}-bug-803.patch
-Patch1:		%{name}-gsm.patch
+Patch0:		%{name}-gsm.patch
 URL:		http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:	OpenAL-devel}
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	celt-devel >= 0.11.0
-BuildRequires:	dirac-devel >= 1.0.0
 %{?with_nonfree:BuildRequires:	faac-devel}
 BuildRequires:	freetype-devel
 %{?with_frei0r:BuildRequires:	frei0r-devel}
@@ -165,7 +160,6 @@
 Requires:	alsa-lib-devel
 Requires:	bzip2-devel
 Requires:	celt-devel >= 0.11.0
-Requires:	dirac-devel >= 1.0.0
 %{?with_nonfree:Requires:	faac-devel}
 Requires:	jack-audio-connection-kit-devel
 Requires:	lame-libs-devel >= 3.98.3
@@ -250,7 +244,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -331,7 +324,6 @@
 	--enable-libcelt \
 	--enable-libcdio \
 	--enable-libdc1394 \
-	--enable-libdirac \
 	--enable-libgsm \
 	--enable-libmodplug \
 	--enable-libmp3lame \
@@ -457,13 +449,15 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.54
 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.54
 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libavfilter.so.2
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.54
+%attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.0
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libavutil.so.51
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
@@ -481,6 +475,7 @@
 %attr(755,root,root) %{_libdir}/libavdevice.so
 %attr(755,root,root) %{_libdir}/libavfilter.so
 %attr(755,root,root) %{_libdir}/libavformat.so
+%attr(755,root,root) %{_libdir}/libavresample.so
 %attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so
 %attr(755,root,root) %{_libdir}/libswresample.so
@@ -490,6 +485,7 @@
 %{_includedir}/libavdevice
 %{_includedir}/libavfilter
 %{_includedir}/libavformat
+%{_includedir}/libavresample
 %{_includedir}/libavutil
 %{_includedir}/libpostproc
 %{_includedir}/libswresample
@@ -498,6 +494,7 @@
 %{_pkgconfigdir}/libavdevice.pc
 %{_pkgconfigdir}/libavfilter.pc
 %{_pkgconfigdir}/libavformat.pc
+%{_pkgconfigdir}/libavresample.pc
 %{_pkgconfigdir}/libavutil.pc
 %{_pkgconfigdir}/libpostproc.pc
 %{_pkgconfigdir}/libswresample.pc
@@ -509,6 +506,7 @@
 %{_libdir}/libavdevice.a
 %{_libdir}/libavfilter.a
 %{_libdir}/libavformat.a
+%{_libdir}/libavresample.a
 %{_libdir}/libavutil.a
 %{_libdir}/libpostproc.a
 %{_libdir}/libswresample.a
@@ -535,6 +533,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2012/06/05 13:47:17  qboosh
+- up to 0.11 (note: new libav{codec,device,format} sonames; ffmpeg 0.10.x on FFMPEG_0_10 branch); fixes
+  CVE-2012-2772 CVE-2012-2774 CVE-2012-2775 CVE-2012-2776 CVE-2012-2777
+  CVE-2012-2779 CVE-2012-2782 CVE-2012-2783 CVE-2012-2784 CVE-2012-2785
+  CVE-2012-2786 CVE-2012-2787 CVE-2012-2788 CVE-2012-2789 CVE-2012-2790
+  CVE-2012-2791 CVE-2012-2792 CVE-2012-2793 CVE-2012-2794 CVE-2012-2795
+  CVE-2012-2796 CVE-2012-2797 CVE-2012-2798 CVE-2012-2799 CVE-2012-2800
+  CVE-2012-2801 CVE-2012-2802 CVE-2012-2803 CVE-2012-2804
+- removed outdated bug-803 patch
+- introduced libavresample library
+- no longer uses libdirac, only native dirac decoder
+- test release 0.1
+
 Revision 1.251  2012/05/09 13:39:50  qboosh
 - added CVE note to 0.10.3 changelog entry
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ffmpeg/ffmpeg.spec?r1=1.251&r2=1.252

More information about the pld-cvs-commit mailing list