X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avifile.spec;h=4a8a51dd092147a581108bab4ecdf397ea7b6711;hb=refs%2Ftags%2Fauto%2Fti%2Favifile-0_7_45-14;hp=2ec518b85b2054b7d28abb23fd0fab7360932f97;hpb=54638aa6b7db0dc5d7a83986c4ca218357c22dba;p=packages%2Favifile.git

diff --git a/avifile.spec b/avifile.spec
index 2ec518b..4a8a51d 100644
--- a/avifile.spec
+++ b/avifile.spec
@@ -10,7 +10,7 @@ Summary(pl.UTF-8):	Biblioteka do odtwarzania plików AVI
 Summary(pt_BR.UTF-8):	Biblioteca para reproduzir formatos de áudio e vídeo usando binários win32
 Name:		avifile
 Version:	0.7.45
-Release:	4
+Release:	14
 Epoch:		3
 License:	GPL
 Group:		X11/Libraries
@@ -33,6 +33,11 @@ Patch12:	%{name}-link.patch
 Patch13:	%{name}-am.patch
 Patch14:	%{name}-gcc4.patch
 Patch15:	%{name}-compile.patch
+Patch16:	%{name}-extern_c_ffmpeg.patch
+Patch17:	%{name}-xf86dga.patch
+Patch18:	%{name}-new_ffmpeg.patch
+Patch19:	%{name}-fix-no-bits_per_sample.patch
+Patch20:	%{name}-gcc44.patch
 URL:		http://avifile.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
 BuildRequires:	a52dec-libs-devel
@@ -68,7 +73,7 @@ BuildConflicts:	wine-devel
 Obsoletes:	avifile-vidix-nvidia
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags	-fno-strict-aliasing
+%define		specflags	-fno-strict-aliasing -D__STDC_CONSTANT_MACROS
 
 %description
 Avifile is a library that allow programs to read and write compressed
@@ -239,7 +244,7 @@ Summary:	Win32 audio/video plugin
 Summary(pl.UTF-8):	Wtyczka audio/video win32
 Group:		X11/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	w32codec
+Suggests:	w32codec
 
 %description win32
 Plugin for using Win32 DLL libraries in avifile located in
@@ -353,6 +358,11 @@ rm -rf ffmpeg m4/ffmpeg.m4
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 # unwanted hack
 rm -f m4/as.m4
@@ -367,7 +377,7 @@ rm -f m4/as.m4
 %{__automake}
 
 %configure \
-	CPPFLAGS="-I/usr/include/divx" \
+	CPPFLAGS="-I/usr/include/divx -I/usr/include/libavformat -I/usr/include/libavcodec" \
 	--with-qt-includes=%{_includedir}/qt \
 	--with-qt-libraries=%{_libdir} \
 	--enable-a52 \