rpms/ffmpeg/F-9 .cvsignore, 1.2, 1.3 ffmpeg-snapshot.sh, 1.1, 1.2 ffmpeg.spec, 1.2, 1.3 sources, 1.2, 1.3

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/ffmpeg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18232

Modified Files:
	.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources 
Log Message:
* Sun Sep 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.48.20080908
- 20080908 snapshot (r25261), last before ABI change
- fix build --with amr
- update snapshot.sh
- drop liba52 support, native ac3 decoder is better in every way
- use CFLAGS more similar to upstream
- enable X11 grabbing input
- enable libavfilter



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2008 17:08:12 -0000	1.2
+++ .cvsignore	17 Sep 2008 22:57:37 -0000	1.3
@@ -1 +1 @@
-ffmpeg-20080614.tar.bz2
+ffmpeg-20080908.tar.bz2


Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/ffmpeg-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-snapshot.sh	5 Aug 2008 17:08:12 -0000	1.1
+++ ffmpeg-snapshot.sh	17 Sep 2008 22:57:37 -0000	1.2
@@ -17,7 +17,7 @@
 cd "$tmp"
 svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
 cd ffmpeg-$svn
-./version.sh .
+./version.sh . version.h
 find . -type d -name .svn -print0 | xargs -0r rm -rf
 sed -i -e '/^\.PHONY: version\.h$/d' Makefile
 cd ..


Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/ffmpeg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg.spec	10 Aug 2008 14:30:25 -0000	1.2
+++ ffmpeg.spec	17 Sep 2008 22:57:37 -0000	1.3
@@ -1,12 +1,12 @@
 # TODO: add make test to %%check section
 
-%define svn     20080614
+%define svn     20080908
 %define faad2min 1:2.6.1
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
 Version:        0.4.9
-Release:        0.47.%{svn}%{?dist}.1
+Release:        0.48.%{svn}%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://ffmpeg.org/
@@ -15,7 +15,6 @@
 Patch4:         %{name}-asmreg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  a52dec-devel
 %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 BuildRequires:  zlib-devel
 BuildRequires:  lame-devel
@@ -30,6 +29,8 @@
 BuildRequires:  texi2html
 BuildRequires:  faac-devel
 BuildRequires:  x264-devel >= 0.0.0-0.14.20080613
+#don't enable until PIC issues on x86_64 are fixed ('ff_imdct_half_sse' in libavcodec/i386/fft_sse.c)
+#BuildRequires:  yasm
 
 %description
 FFMpeg is a complete and free Internet live audio and video
@@ -76,10 +77,9 @@
     --shlibdir=%{_libdir} \
     --mandir=%{_mandir} \
     --arch=%{_target_cpu} \
-    --extra-cflags="$RPM_OPT_FLAGS" \
-    %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \
+    --extra-cflags="$RPM_OPT_FLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fno-math-errno" \
+    %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \
     --enable-libdc1394 \
-    --enable-liba52 \
     --enable-libfaac \
     --enable-libfaad \
     --enable-libgsm \
@@ -88,6 +88,9 @@
     --enable-libvorbis \
     --enable-libx264 \
     --enable-libxvid \
+    --enable-x11grab \
+    --enable-avfilter \
+    --enable-avfilter-lavf \
     --enable-postproc \
     --enable-swscale \
     --enable-pthreads \
@@ -132,6 +135,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/libavcodec.so.*
 %{_libdir}/libavdevice.so.*
+%{_libdir}/libavfilter.so.*
 %{_libdir}/libavformat.so.*
 %{_libdir}/libavutil.so.*
 %{_libdir}/libpostproc.so.*
@@ -144,6 +148,7 @@
 %{_includedir}/ffmpeg
 %{_libdir}/libavcodec.so
 %{_libdir}/libavdevice.so
+%{_libdir}/libavfilter.so
 %{_libdir}/libavformat.so
 %{_libdir}/libavutil.so
 %{_libdir}/libpostproc.so
@@ -151,12 +156,22 @@
 %{_libdir}/pkgconfig/libswscale.pc
 %{_libdir}/pkgconfig/libavcodec.pc
 %{_libdir}/pkgconfig/libavdevice.pc
+%{_libdir}/pkgconfig/libavfilter.pc
 %{_libdir}/pkgconfig/libavformat.pc
 %{_libdir}/pkgconfig/libavutil.pc
 %{_libdir}/pkgconfig/libpostproc.pc
 
 
 %changelog
+* Thu Sep 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.48.20080908
+- 20080908 snapshot (r25261), last before ABI change
+- fix build --with amr
+- update snapshot.sh
+- drop liba52 support, native ac3 decoder is better in every way
+- use CFLAGS more similar to upstream
+- enable X11 grabbing input
+- enable libavfilter
+
 * Sun Aug 10 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.9-0.47.20080614.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2008 17:08:12 -0000	1.2
+++ sources	17 Sep 2008 22:57:37 -0000	1.3
@@ -1 +1 @@
-322a5f53e33b5b4f312ed798d14c6ced  ffmpeg-20080614.tar.bz2
+0165b69b8e5bfc7a82fcf2247269b84b  ffmpeg-20080908.tar.bz2