From 3d02632bb3e9b5d9e6dbc35cb3146f34c75c6849 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 8 Sep 2005 00:42:54 +0000 Subject: [PATCH] - patch mp3ff.h instead including needless include for non-win32 platform Changed files: faad2-inttypes_h.patch -> 1.1 faad2.spec -> 1.19 --- faad2-inttypes_h.patch | 16 ++++++++++++++++ faad2.spec | 7 +++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 faad2-inttypes_h.patch diff --git a/faad2-inttypes_h.patch b/faad2-inttypes_h.patch new file mode 100644 index 0000000..5efa8a7 --- /dev/null +++ b/faad2-inttypes_h.patch @@ -0,0 +1,16 @@ +remove need for inclusion of mp4ff_int_types.h in -devel package + +--- ./common/mp4ff/mp4ff.h~ 2004-01-11 17:52:18.000000000 +0200 ++++ ./common/mp4ff/mp4ff.h 2005-09-08 03:29:23.000000000 +0300 +@@ -32,7 +32,11 @@ + extern "C" { + #endif /* __cplusplus */ + ++#ifdef _WIN32 + #include "mp4ff_int_types.h" ++#else ++#include ++#endif + + /* file callback structure */ + typedef struct diff --git a/faad2.spec b/faad2.spec index a3115ef..c43f7f7 100644 --- a/faad2.spec +++ b/faad2.spec @@ -11,7 +11,7 @@ Summary: Freeware Advanced Audio Decoder 2 Summary(pl): Darmowy zaawansowany dekoder audio Name: faad2 Version: 2.0 -Release: 5.2 +Release: 5.3 License: GPL Group: Applications/Sound Source0: http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch1: %{name}-mp4v2.patch Patch2: %{name}-no-extension.patch Patch3: %{name}-mpeg4ip.patch Patch4: %{name}-gcc4.patch +Patch5: %{name}-inttypes_h.patch URL: http://www.audiocoding.com/ BuildRequires: autoconf BuildRequires: automake @@ -113,6 +114,7 @@ Wtyczka XMMS do plik %patch2 -p1 #%patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__libtoolize} @@ -135,8 +137,6 @@ rm -rf $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a} rm -f $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a} -install ./common/mp4ff/mp4ff_int_types.h $RPM_BUILD_ROOT%{_includedir} - %clean rm -rf $RPM_BUILD_ROOT @@ -161,7 +161,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libmp4ff.la %{_includedir}/faad.h %{_includedir}/mp4ff.h -%{_includedir}/mp4ff_int_types.h %files static %defattr(644,root,root,755) -- 2.44.0