[packages/faad2] - added mp4v2 patch (adjust for mpeg4ip with updated mp4v2)

[qboosh]

commit ea603bc130332ccb905734a6cb90dc13b8e9f482
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 9 11:20:24 2012 +0100

    - added mp4v2 patch (adjust for mpeg4ip with updated mp4v2)

 faad2-mp4v2.patch | 21 +++++++++++++++++++++
 faad2.spec        |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index a37c0de..ecaf9b1 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -21,13 +21,17 @@ Patch2:		%{name}-soname.patch
 Patch3:		%{name}-backward_compat.patch
 Patch4:		%{name}-mp4ff.patch
 Patch5:		%{name}-man.patch
+Patch6:		%{name}-mp4v2.patch
 URL:		http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires:	SDL-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_xmms:BuildRequires:	id3lib-devel >= 3.8.2}
 BuildRequires:	libtool >= 2:1.4d-3
-%{?with_mpeg4ip:BuildRequires:	mpeg4ip-devel >= 1:1.6}
+%if %{with mpeg4ip}
+BuildRequires:	mp4v2-devel
+BuildRequires:	mpeg4ip-devel >= 1:1.6
+%endif
 %{?with_xmms:BuildRequires:	rpmbuild(macros) >= 1.125}
 %{?with_xmms:BuildRequires:	xmms-devel}
 Requires:	%{name}-libs = %{version}-%{release}
@@ -115,6 +119,7 @@ Wtyczka XMMS do plików AAC.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 mv -f frontend/faad.{man,1}
 
 %build
diff --git a/faad2-mp4v2.patch b/faad2-mp4v2.patch
new file mode 100644
index 0000000..2c01f31
--- /dev/null
+++ b/faad2-mp4v2.patch
@@ -0,0 +1,21 @@
+--- faad2-2.7/plugins/mpeg4ip/faad2.cpp.orig	2012-12-09 09:30:54.613929786 +0100
++++ faad2-2.7/plugins/mpeg4ip/faad2.cpp	2012-12-09 11:02:12.133815617 +0100
+@@ -21,7 +21,7 @@
+ #include "faad2.h"
+ #include <mpeg4_audio_config.h>
+ #include <mpeg4_sdp.h>
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ #include <SDL/SDL.h>
+ 
+ #define DEBUG_SYNC 2
+--- faad2-2.7/plugins/mpeg4ip/Makefile.am.orig	2003-08-07 19:21:21.000000000 +0200
++++ faad2-2.7/plugins/mpeg4ip/Makefile.am	2012-12-09 11:12:59.277135462 +0100
+@@ -10,6 +10,7 @@
+ 
+ faad2_plugin_la_LIBADD = \
+ 	$(top_builddir)/libfaad/libfaad.la \
++	-lmp4util \
+ 	-lm
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/faad2.git/commitdiff/ea603bc130332ccb905734a6cb90dc13b8e9f482