packages: ffmpeg/ffmpeg-gsm.patch, ffmpeg/ffmpeg.spec - up to 0.9

[arekm]

Author: arekm                        Date: Tue Dec 13 20:07:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9

---- Files affected:
packages/ffmpeg:
   ffmpeg-gsm.patch (1.2 -> 1.3) , ffmpeg.spec (1.234 -> 1.235) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg-gsm.patch
diff -u packages/ffmpeg/ffmpeg-gsm.patch:1.2 packages/ffmpeg/ffmpeg-gsm.patch:1.3
--- packages/ffmpeg/ffmpeg-gsm.patch:1.2	Mon Jun 27 17:14:47 2011
+++ packages/ffmpeg/ffmpeg-gsm.patch	Tue Dec 13 21:07:40 2011
@@ -1,14 +1,14 @@
 --- configure.orig	2011-06-21 21:29:25.000000000 +0200
 +++ configure	2011-06-26 20:07:17.579181375 +0200
-@@ -2920,7 +2920,7 @@
+@@ -3071,7 +3071,7 @@
      "dirac_decoder_init dirac_encoder_init"
  enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
  enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
 -enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
 +enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
+ enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
  enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
  enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 --- libavcodec/libgsm.c~	2010-04-20 16:45:34.000000000 +0200
 +++ libavcodec/libgsm.c	2010-06-18 08:05:19.692574999 +0200
 @@ -28,7 +28,7 @@

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.234 packages/ffmpeg/ffmpeg.spec:1.235
--- packages/ffmpeg/ffmpeg.spec:1.234	Tue Nov 22 20:40:22 2011
+++ packages/ffmpeg/ffmpeg.spec	Tue Dec 13 21:07:40 2011
@@ -15,7 +15,7 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	0.8.7
+Version:	0.9
 Release:	1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
@@ -23,7 +23,7 @@
 License:	GPL v3+ with LGPL v3+ parts
 Group:		Applications/Multimedia
 Source0:	http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	31da4d5610d7138761e23fab8fe3a84d
+# Source0-md5:	795058de6fc432aa11271408273a0535
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
@@ -56,8 +56,8 @@
 BuildRequires:	libvdpau-devel
 BuildRequires:	libvorbis-devel
 %{?with_vpx:BuildRequires:	libvpx-devel >= 0.9.6}
-# X264_BUILD >= 115
-%{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20110625_2245}
+# X264_BUILD >= 118
+%{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20111212_2245}
 BuildRequires:	opencore-amr-devel
 BuildRequires:	openjpeg-devel >= 1.3-2
 BuildRequires:	speex-devel >= 1:1.2-rc1
@@ -414,12 +414,14 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CREDITS LICENSE MAINTAINERS README doc/{APIchanges,RELEASE_NOTES,TODO} %{?with_doc:doc/*.html}
+%doc CREDITS LICENSE MAINTAINERS README doc/{APIchanges,RELEASE_NOTES} %{?with_doc:doc/*.html}
+%attr(755,root,root) %{_bindir}/avconv
 %attr(755,root,root) %{_bindir}/ffmpeg
 %attr(755,root,root) %{_bindir}/ffprobe
 %attr(755,root,root) %{_bindir}/qt-faststart
 %dir %{_datadir}/ffmpeg
 %{_datadir}/ffmpeg/*.ffpreset
+%{?with_doc:%{_mandir}/man1/avconv.1*}
 %{?with_doc:%{_mandir}/man1/ffmpeg.1*}
 %{?with_doc:%{_mandir}/man1/ffprobe.1*}
 
@@ -437,6 +439,8 @@
 %attr(755,root,root) %ghost %{_libdir}/libavutil.so.51
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpostproc.so.51
+%attr(755,root,root) %{_libdir}/libswresample.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libswresample.so.0
 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
 
@@ -450,6 +454,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}/libswresample.so
 %attr(755,root,root) %{_libdir}/libswscale.so
 %{_includedir}/ffmpeg
 %{_includedir}/libavcodec
@@ -458,6 +463,7 @@
 %{_includedir}/libavformat
 %{_includedir}/libavutil
 %{_includedir}/libpostproc
+%{_includedir}/libswresample
 %{_includedir}/libswscale
 %{_pkgconfigdir}/libavcodec.pc
 %{_pkgconfigdir}/libavdevice.pc
@@ -465,6 +471,7 @@
 %{_pkgconfigdir}/libavformat.pc
 %{_pkgconfigdir}/libavutil.pc
 %{_pkgconfigdir}/libpostproc.pc
+%{_pkgconfigdir}/libswresample.pc
 %{_pkgconfigdir}/libswscale.pc
 
 %files static
@@ -475,6 +482,7 @@
 %{_libdir}/libavformat.a
 %{_libdir}/libavutil.a
 %{_libdir}/libpostproc.a
+%{_libdir}/libswresample.a
 %{_libdir}/libswscale.a
 
 %files ffplay
@@ -498,6 +506,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.235  2011/12/13 20:07:40  arekm
+- up to 0.9
+
 Revision 1.234  2011/11/22 19:40:22  charles
 - up to 0.8.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg-gsm.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.234&r2=1.235&f=u