diff options
| author | Matt Housh <jaeger@crux.nu> | 2009-09-24 22:23:30 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2009-09-24 22:23:30 -0500 |
| commit | 18b53830e9de61e1a321ef152f86ce81d8db3f25 (patch) | |
| tree | fc5ca3b629c634384061aca49ed4cab9ad58817c /faac | |
| parent | 4dc47759d048d1015ccb231aaeb3c2d57dc32f29 (diff) | |
| download | contrib-18b53830e9de61e1a321ef152f86ce81d8db3f25.tar.gz contrib-18b53830e9de61e1a321ef152f86ce81d8db3f25.tar.xz | |
faac: updated to version 1.28, added external libmp4v2 patch, thanks thrice/gentoo
Diffstat (limited to 'faac')
| -rw-r--r-- | faac/.md5sum | 3 | ||||
| -rw-r--r-- | faac/Pkgfile | 10 | ||||
| -rw-r--r-- | faac/faac-1.28-external-libmp4v2.patch | 47 |
3 files changed, 55 insertions, 5 deletions
diff --git a/faac/.md5sum b/faac/.md5sum index f62ebf8c9..9c55ebba4 100644 --- a/faac/.md5sum +++ b/faac/.md5sum @@ -1 +1,2 @@ -e72dc74db17b42b06155613489077ad7 faac-1.24.tar.gz +9d52a17e68fa15ca94e88e1457b94b74 faac-1.28-external-libmp4v2.patch +c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2 diff --git a/faac/Pkgfile b/faac/Pkgfile index c786ad515..2e1af46e9 100644 --- a/faac/Pkgfile +++ b/faac/Pkgfile @@ -4,15 +4,17 @@ # Depends on: faad2 name=faac -version=1.24 +version=1.28 release=1 -source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz) +source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2 \ + $name-$version-external-libmp4v2.patch) build () { - cd $name + cd $name-$version + patch -p1 -i $SRC/$name-$version-external-libmp4v2.patch chmod +x bootstrap ./bootstrap - ./configure --prefix=/usr + ./configure --prefix=/usr --mandir=/usr/man make CFLAGS="$CFLAGS" make prefix=$PKG/usr install } diff --git a/faac/faac-1.28-external-libmp4v2.patch b/faac/faac-1.28-external-libmp4v2.patch new file mode 100644 index 000000000..54a63347b --- /dev/null +++ b/faac/faac-1.28-external-libmp4v2.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 |