SPECS: avifile.spec - use system-wide ffmpeg.

[pluto]

Author: pluto                        Date: Mon Mar 20 02:41:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system-wide ffmpeg.

---- Files affected:
SPECS:
   avifile.spec (1.182 -> 1.183) 

---- Diffs:

================================================================
Index: SPECS/avifile.spec
diff -u SPECS/avifile.spec:1.182 SPECS/avifile.spec:1.183
--- SPECS/avifile.spec:1.182	Thu Mar  9 08:04:46 2006
+++ SPECS/avifile.spec	Mon Mar 20 03:41:00 2006
@@ -26,12 +26,11 @@
 Patch5:		%{name}-link_shared.patch
 Patch6:		%{name}-no_libnsl.patch
 Patch7:		%{name}-system-libmad.patch
-Patch8:		%{name}-ffmpeg-alpha.patch
+Patch8:		%{name}-system_wide_ffmpeg.patch
 Patch9:		%{name}-opt.patch
-Patch10:	%{name}-ffmpeg-ppc.patch
-Patch11:	%{name}-opts.patch
-Patch12:	%{name}-sparc.patch
-Patch13:	%{name}-link.patch
+Patch10:	%{name}-opts.patch
+Patch11:	%{name}-sparc.patch
+Patch12:	%{name}-link.patch
 URL:		http://avifile.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
 BuildRequires:	a52dec-libs-devel
@@ -40,6 +39,7 @@
 BuildRequires:	automake
 %{?with_divx:BuildRequires:	divx4linux-devel}
 BuildRequires:	faad2-devel
+BuildRequires:	ffmpeg-devel
 %ifarch ppc
 # version with altivec support fixed
 BuildRequires:	gcc >= 5:3.3.2-3
@@ -66,6 +66,8 @@
 Obsoletes:	avifile-vidix-nvidia
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags	-fno-strict-aliasing
+
 %description
 Avifile is a library that allow programs to read and write compressed
 AVI files (Indeo Video, DivX ;-), etc.) under x86 Linux.
@@ -332,6 +334,7 @@
 
 %prep
 %setup -q -n %{name}-0.7-%{version}
+rm -rf ffmpeg m4/ffmpeg.m4
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -345,7 +348,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 # unwanted hack
 rm -f m4/as.m4
@@ -365,8 +367,6 @@
 	--with-qt-libraries=%{_libdir} \
 	--enable-a52 \
 	%{?with_divx:--enable-divx4} \
-	--enable-ffmpeg \
-	--enable-ffmpeg-a52 \
 	--enable-lamebin \
 	--disable-lame \
 	--enable-libmad \
@@ -537,6 +537,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2006/03/20 02:41:00  pluto
+- use system-wide ffmpeg.
+
 Revision 1.182  2006/03/09 07:04:46  qboosh
 - updated to 0.7.45, updated opt,ffmpeg-ppc patches, added link patch
 - switched to modular xorg
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/avifile.spec?r1=1.182&r2=1.183&f=u