From d433d89cdc493c299ae4c451657303d7d2f9b0b7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 5 Jul 2011 00:09:48 +0200
Subject: [PATCH] faac: make this build with newer libmp4v2.

---
 srcpkgs/faac/faac-devel.template     |  5 ++-
 srcpkgs/faac/patches/libmp4v2.patch  | 11 -------
 srcpkgs/faac/patches/mp4v2-1.9.patch | 47 ++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/faac/patches/libmp4v2.patch
 create mode 100644 srcpkgs/faac/patches/mp4v2-1.9.patch

diff --git a/srcpkgs/faac/faac-devel.template b/srcpkgs/faac/faac-devel.template
index 09358e170fa..e55d0e29010 100644
--- a/srcpkgs/faac/faac-devel.template
+++ b/srcpkgs/faac/faac-devel.template
@@ -12,7 +12,6 @@ Add_dependency run faac
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/faac/patches/libmp4v2.patch b/srcpkgs/faac/patches/libmp4v2.patch
deleted file mode 100644
index b5e2ada72f3..00000000000
--- a/srcpkgs/faac/patches/libmp4v2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in   2008-03-02 17:27:47.000000000 +0100
-+++ configure.in   2008-03-02 17:30:15.000000000 +0100
-@@ -36,6 +36,8 @@
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  MY_DEFINE(HAVE_LIBMP4V2)
-+  LIBS="-lmp4v2 $LIBS"
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff --git a/srcpkgs/faac/patches/mp4v2-1.9.patch b/srcpkgs/faac/patches/mp4v2-1.9.patch
new file mode 100644
index 00000000000..84314e6c1b0
--- /dev/null
+++ b/srcpkgs/faac/patches/mp4v2-1.9.patch
@@ -0,0 +1,47 @@
+diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
+--- configure.in	2009-02-05 02:55:38.000000000 +0200
++++ configure.in	2009-07-10 13:21:34.000000000 +0300
+@@ -28,14 +28,17 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+                             external_mp4v2=no, -lstdc++),
+-               external_mp4v2=no, [#include <mp4.h>])
++               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  MY_DEFINE(HAVE_LIBMP4V2)
++  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
+--- frontend/main.c	2009-01-24 03:10:20.000000000 +0200
++++ frontend/main.c	2009-07-10 13:22:18.000000000 +0300
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #ifdef HAVE_LIBMP4V2
+-# include <mp4.h>
++# include <mp4v2/mp4v2.h>
+ #endif
+ 
+ #define DEFAULT_TNS     0
+diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
+--- frontend/Makefile.am	2008-12-16 02:56:00.000000000 +0200
++++ frontend/Makefile.am	2009-07-10 13:21:55.000000000 +0300
+@@ -8,5 +8,9 @@
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include 
++if WITH_EXTERNAL_MP4V2
++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
++else
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
++endif