diff options
| -rw-r--r-- | abs/core/faac/PKGBUILD | 34 | ||||
| -rw-r--r-- | abs/core/faac/__changelog | 2 | ||||
| -rw-r--r-- | abs/core/faac/mp4v2-1.9.patch | 47 |
3 files changed, 70 insertions, 13 deletions
diff --git a/abs/core/faac/PKGBUILD b/abs/core/faac/PKGBUILD index 3d7ce11..7b6b3a7 100644 --- a/abs/core/faac/PKGBUILD +++ b/abs/core/faac/PKGBUILD @@ -1,28 +1,36 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# $Id: PKGBUILD 71335 2010-03-06 18:43:34Z andrea $ +# Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> + pkgname=faac -pkgver=1.26 -pkgrel=1 -pkgdesc="FAAC is an AAC audio encoder." -arch=(i686 x86_64) +pkgver=1.28 +pkgrel=2 +pkgdesc="FAAC is an AAC audio encoder" +arch=('i686' 'x86_64') url="http://www.audiocoding.com/" license=('GPL' 'custom') -depends=('libmp4v2' 'glibc') +depends=('libmp4v2>=1.9.1' 'glibc') makedepends=('automake' 'autoconf' 'libtool') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'mp4v2-1.9.patch') +md5sums=('80763728d392c7d789cde25614c878f6' + '9d52a17e68fa15ca94e88e1457b94b74') build() { - cd ${startdir}/src/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} + 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 - make DESTDIR=${startdir}/pkg install +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install - install -D -m644 ${startdir}/src/${pkgname}/libfaac/kiss_fft/COPYING \ - ${startdir}/pkg/usr/share/licenses/faac/COPYING.kiss_fft + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \ + ${pkgdir}/usr/share/licenses/faac/LICENSE } -md5sums=('1d7c019bd2dbb4f3101b8937ebc59cf6') diff --git a/abs/core/faac/__changelog b/abs/core/faac/__changelog new file mode 100644 index 0000000..b91559b --- /dev/null +++ b/abs/core/faac/__changelog @@ -0,0 +1,2 @@ +change depends to libmp4v2>=1.9.1 as an earlier version (1.6) caused faac build to error. + diff --git a/abs/core/faac/mp4v2-1.9.patch b/abs/core/faac/mp4v2-1.9.patch new file mode 100644 index 0000000..54a6334 --- /dev/null +++ b/abs/core/faac/mp4v2-1.9.patch @@ -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 |