[arch-commits] Commit in faac/trunk (PKGBUILD libmp4v2.patch mp4v2-1.9.patch)

[Andrea Scarpino]

    Date: Saturday, March 6, 2010 @ 13:43:34
  Author: andrea
Revision: 71335

upgpkg: faac 1.28-2
rebuilt and patched for mp4v2 1.9.1

Added:
  faac/trunk/mp4v2-1.9.patch
Modified:
  faac/trunk/PKGBUILD
Deleted:
  faac/trunk/libmp4v2.patch

-----------------+
 PKGBUILD        |   22 ++++++++++++++--------
 libmp4v2.patch  |   11 -----------
 mp4v2-1.9.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-06 18:42:26 UTC (rev 71334)
+++ PKGBUILD	2010-03-06 18:43:34 UTC (rev 71335)
@@ -2,29 +2,35 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: Sarah Hay <sarah at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=faac
 pkgver=1.28
-pkgrel=1
-pkgdesc="FAAC is an AAC audio encoder."
+pkgrel=2
+pkgdesc="FAAC is an AAC audio encoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
 license=('GPL' 'custom')
 depends=('libmp4v2' 'glibc')
 makedepends=('automake' 'autoconf' 'libtool')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz libmp4v2.patch)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	'mp4v2-1.9.patch')
+md5sums=('80763728d392c7d789cde25614c878f6'
+         '9d52a17e68fa15ca94e88e1457b94b74')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libmp4v2.patch || return 1
+  patch -Np1 -i ${srcdir}/mp4v2-1.9.patch || return 1
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
   ./configure --prefix=/usr --with-mp4v2
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
-                   ${pkgdir}/usr/share/licenses/faac/COPYING.kiss_fft
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+    ${pkgdir}/usr/share/licenses/faac/LICENSE
 }
-md5sums=('80763728d392c7d789cde25614c878f6'
-         'cce9b24cecc90d9b157adbf94176a454')

Deleted: libmp4v2.patch
===================================================================
--- libmp4v2.patch	2010-03-06 18:42:26 UTC (rev 71334)
+++ libmp4v2.patch	2010-03-06 18:43:34 UTC (rev 71335)
@@ -1,11 +0,0 @@
---- faac/configure.in   2008-03-02 17:27:47.000000000 +0100
-+++ faac/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 ***])

Added: mp4v2-1.9.patch
===================================================================
--- mp4v2-1.9.patch	                        (rev 0)
+++ mp4v2-1.9.patch	2010-03-06 18:43:34 UTC (rev 71335)
@@ -0,0 +1,47 @@
+diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
+--- faac-1.28.orig/configure.in	2009-02-05 02:55:38.000000000 +0200
++++ faac-1.28/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
+--- faac-1.28.orig/frontend/main.c	2009-01-24 03:10:20.000000000 +0200
++++ faac-1.28/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
+--- faac-1.28.orig/frontend/Makefile.am	2008-12-16 02:56:00.000000000 +0200
++++ faac-1.28/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