SPECS: ffmpeg.spec - up to snap 2007-06-09

[arekm]

Author: arekm                        Date: Sat Jun  9 18:33:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to snap 2007-06-09

---- Files affected:
SPECS:
   ffmpeg.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.132 SPECS/ffmpeg.spec:1.133
--- SPECS/ffmpeg.spec:1.132	Wed Apr 11 21:52:39 2007
+++ SPECS/ffmpeg.spec	Sat Jun  9 20:33:54 2007
@@ -7,7 +7,7 @@
 %bcond_without	autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	imlib2		# don't build imlib2 vhook module
 #
-%define		_snap	2007-04-11
+%define		_snap	2007-06-09
 %define		snap	%(echo %{_snap} | tr -d -)
 %define		_rel 1
 Summary:	Realtime audio/video encoder and streaming server
@@ -16,21 +16,19 @@
 Version:	0.4.9
 Release:	3.%{snap}.%{_rel}
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (postprocessing, a52, xvid, x264, dts, faad)
+# (postprocessing, a52, xvid, x264, faad)
 License:	GPL with LGPL parts
 Group:		Applications/Multimedia
 #Source0:	http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
 Source0:	http://ffmpeg.mplayerhq.hu/%{name}-export-snapshot.tar.bz2
-# Source0-md5:	f752ea3f480d06a16f64991af913afc0
+# Source0-md5:	d7f9e7d673b589d21d256c469acf611b
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
 Patch0:		%{name}-link.patch
-Patch2:		%{name}-gcc4.patch
-Patch3:		%{name}-system-amr.patch
-Patch4:		%{name}-x264-symbol.patch
-Patch5:		%{name}-kill-mabi_altivec.patch
-Patch6:		%{name}-img_convert_symbol.patch
+Patch1:		%{name}-gcc4.patch
+Patch2:		%{name}-kill-mabi_altivec.patch
+Patch3:		%{name}-img_convert_symbol.patch
 URL:		http://ffmpeg.mplayerhq.hu/
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
@@ -47,7 +45,6 @@
 %endif
 %{?with_imlib2:BuildRequires:	imlib2-devel >= 1.3.0}
 BuildRequires:	lame-libs-devel
-BuildRequires:	libdts-devel
 BuildRequires:	libgsm-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libraw1394-devel
@@ -207,11 +204,9 @@
 %prep
 %setup -q -n %{name}-export-%{_snap}
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 # notes:
@@ -225,7 +220,6 @@
 	--disable-strip \
 	--enable-liba52 \
 	--enable-liba52bin \
-	--enable-libdts \
 	--enable-libfaac \
 	--enable-libfaad \
 	--enable-libfaadbin \
@@ -239,8 +233,8 @@
 	--enable-shared \
 	--enable-swscaler \
 	--enable-libvorbis \
-	--enable-x264 \
-	--enable-xvid \
+	--enable-libx264 \
+	--enable-libxvid \
 %ifnarch %{ix86} %{x8664}
 	--disable-mmx \
 %endif
@@ -363,6 +357,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2007/06/09 18:33:54  arekm
+- up to snap 2007-06-09
+
 Revision 1.132  2007/04/11 19:52:39  glen
 - updated to 2007-04-11:
   - TIFF picture encoder and decoder
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.132&r2=1.133&f=u