SPECS: ffmpeg.spec - updated to 20060129 snap - updated libtool pa...

[qboosh]

Author: qboosh                       Date: Sun Jan 29 17:27:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 20060129 snap
- updated libtool patch, removed obsolete pkgconfig-version patch
- added (conditional) gcc4-workaround patch instead of disabling MMX at all

---- Files affected:
SPECS:
   ffmpeg.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.59 SPECS/ffmpeg.spec:1.60
--- SPECS/ffmpeg.spec:1.59	Sat Dec 31 10:55:51 2005
+++ SPECS/ffmpeg.spec	Sun Jan 29 18:27:32 2006
@@ -3,25 +3,27 @@
 # Conditional build:
 %bcond_without	imlib2		# we can safely play without it :-)
 %bcond_without	autoreqdep	# don't care about package name deps generated by rpm
-%bcond_with	gcc4		# disable long inline mmx assembly.
+%bcond_without	mmx		# disable long inline mmx assembly.
 				# gcc4+ doesn't like hard register pressure and won't be fixed.
 				# ffmpeg and other apps should be rewritten with <mmintrin.h>.
+%bcond_with	gcc4		# use gcc4 workaround
 #
 Summary:	Realtime audio/video encoder and streaming server
 Summary(pl):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:		ffmpeg
 Version:	0.4.9
-%define	snap	20050806
-Release:	3.%{snap}.5
+%define	snap	20060129
+Release:	3.%{snap}.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 License:	GPL
 Group:		Daemons
 #Source0:	http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
-Source0:	ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
-# Source0-md5:	f5ea3dd877c5df5b60356053642cf542
+#Source0:	ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	d8ea09431d6c0c91bfd35e0ca74a67e1
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-libdir.patch
-Patch2:		%{name}-pkgconfig-version.patch
+Patch2:		%{name}-gcc4-workaround.patch
 URL:		http://ffmpeg.sourceforge.net/
 BuildRequires:	SDL-devel
 BuildRequires:	faac-devel
@@ -139,10 +141,10 @@
 obrazie.
 
 %prep
-%setup -q -n FFMpeg-%{snap}
+%setup -q -n ffmpeg
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%{?with_gcc4:%patch2 -p1}
 
 %build
 # notes:
@@ -164,11 +166,10 @@
 	--enable-pp \
 	--enable-pthreads \
 	--enable-shared \
-	--enable-shared-pp \
 	--enable-theora \
 	--enable-vorbis \
 	--enable-xvid \
-%if %{without gcc4}
+%if %{with mmx}
 %ifnarch %{ix86}
 	--disable-mmx \
 %endif
@@ -186,8 +187,7 @@
 	--tune=generic
 
 %{__make} \
-	BUILD_DOC=yes \
-	LIBVERSION=%{snap}
+	BUILD_DOC=yes
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -212,9 +212,9 @@
 %doc Changelog README doc/*.html
 %attr(755,root,root) %{_bindir}/ffmpeg
 %attr(755,root,root) %{_sbindir}/ffserver
-%attr(755,root,root) %{_libdir}/libavcodec-*.so
-%attr(755,root,root) %{_libdir}/libavformat-*.so
-%attr(755,root,root) %{_libdir}/libavutil-*.so
+%attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
+%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
+%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
 %dir %{_libdir}/vhook
 %attr(755,root,root) %{_libdir}/vhook/drawtext.so
@@ -258,6 +258,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/01/29 17:27:32  qboosh
+- updated to 20060129 snap
+- updated libtool patch, removed obsolete pkgconfig-version patch
+- added (conditional) gcc4-workaround patch instead of disabling MMX at all
+
 Revision 1.59  2005/12/31 09:55:51  pluto
 - fix .pc versioning ("CVS-" -> "49CVS-$build").
 
================================================================

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