SPECS: ffmpeg.spec - gcc4 fix finished.

pluto pluto at pld-linux.org
Mon Jan 30 03:29:17 CET 2006


Author: pluto                        Date: Mon Jan 30 02:29:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gcc4 fix finished.

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

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.60 SPECS/ffmpeg.spec:1.61
--- SPECS/ffmpeg.spec:1.60	Sun Jan 29 18:27:32 2006
+++ SPECS/ffmpeg.spec	Mon Jan 30 03:29:12 2006
@@ -3,17 +3,13 @@
 # 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_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	20060129
-Release:	3.%{snap}.1
+Release:	3.%{snap}.2
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 License:	GPL
 Group:		Daemons
@@ -23,7 +19,7 @@
 # Source0-md5:	d8ea09431d6c0c91bfd35e0ca74a67e1
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-libdir.patch
-Patch2:		%{name}-gcc4-workaround.patch
+Patch2:		%{name}-gcc4.patch
 URL:		http://ffmpeg.sourceforge.net/
 BuildRequires:	SDL-devel
 BuildRequires:	faac-devel
@@ -144,7 +140,7 @@
 %setup -q -n ffmpeg
 %patch0 -p1
 %patch1 -p1
-%{?with_gcc4:%patch2 -p1}
+%patch2 -p1
 
 %build
 # notes:
@@ -169,16 +165,12 @@
 	--enable-theora \
 	--enable-vorbis \
 	--enable-xvid \
-%if %{with mmx}
-%ifnarch %{ix86}
+%ifnarch %{ix86} %{x8664}
 	--disable-mmx \
 %endif
 %ifarch i386 i486
 	--disable-mmx \
 %endif
-%else
-	--disable-mmx \
-%endif
 	--cc="%{__cc}" \
 	--extra-cflags="%{rpmcflags} -fomit-frame-pointer -fno-strict-aliasing" \
 	--extra-ldflags="%{rpmldflags}" \
@@ -258,6 +250,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/01/30 02:29:12  pluto
+- gcc4 fix finished.
+
 Revision 1.60  2006/01/29 17:27:32  qboosh
 - updated to 20060129 snap
 - updated libtool patch, removed obsolete pkgconfig-version patch
================================================================

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



More information about the pld-cvs-commit mailing list