Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=7900212a313e2cb1277b7059cf83e07289ca626c
commit 7900212a313e2cb1277b7059cf83e07289ca626c Author: crazy <[email protected]> Date: Sun Jan 3 06:46:50 2016 +0100 faad2-2.7-5-x86_64 * rebuild with tc * fix depends() * added patch to fix man path * added patch to fix include files * added patch to build libmp4ff shared diff --git a/source/multimedia/faad2/FrugalBuild b/source/multimedia/faad2/FrugalBuild index 2319d62..07570cb 100644 --- a/source/multimedia/faad2/FrugalBuild +++ b/source/multimedia/faad2/FrugalBuild @@ -3,22 +3,27 @@ pkgname=faad2 pkgver=2.7 -pkgrel=4 +pkgrel=5 pkgdesc="ISO AAC audio decoder" _F_sourceforge_dirname="faac" _F_sourceforge_realname="$pkgname-src" Finclude sourceforge url="http://www.audiocoding.com/"; -depends=('libstdc++') -rodepends=('libmp4v2') +depends=('glibc>=2.22-7') groups=('multimedia') archs=('i686' 'x86_64') -makedepends=('libsndfile' 'id3lib') -sha1sums=('80eaaa5cc576c35dd28863767b795c50cbcc0511') - +sha1sums=('80eaaa5cc576c35dd28863767b795c50cbcc0511' \ + '247658aa795cd6d44a153fae8c5cb62e427f3ecf' \ + '0aecf4c132a43fb8e28aee804374918aaa308c29' \ + '4b548a08f7611a5f4f395c7c1d4cef5e37368af2') +source=($source shared.patch \ + include.patch man.patch) build() { + [ "$CARCH" = "i686" ] && unset MAKEFLAGS && export MAKEFLAGS="-j1" + [ "$CARCH" = "x86_64" ] && CFLAGS+=" -fPIC" + Fcd $pkgname-$pkgver Fpatchall Fsed 'AC_PROG_CC' "AC_PROG_CC\nAC_PROG_CXX" configure.in diff --git a/source/multimedia/faad2/include.patch b/source/multimedia/faad2/include.patch new file mode 100644 index 0000000..c7fcba0 --- /dev/null +++ b/source/multimedia/faad2/include.patch @@ -0,0 +1,12 @@ +Install mp4ff_int_types.h for mythmusic. + +http://bugs.gentoo.org/275008 + +--- common/mp4ff/Makefile.am ++++ common/mp4ff/Makefile.am +@@ -1,5 +1,5 @@ + lib_LTLIBRARIES = libmp4ff.la +-include_HEADERS = mp4ff.h mp4ffint.h ++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h + + AM_CFLAGS = -DUSE_TAGGING=1 diff --git a/source/multimedia/faad2/install-libmp4ff.patch b/source/multimedia/faad2/install-libmp4ff.patch deleted file mode 100644 index 33dd932..0000000 --- a/source/multimedia/faad2/install-libmp4ff.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur faad2/common/mp4ff/Makefile.am faad2-libmp4ff/common/mp4ff/Makefile.am ---- faad2/common/mp4ff/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2-libmp4ff/common/mp4ff/Makefile.am 2007-11-02 14:20:01.000000000 +0100 -@@ -1,4 +1,6 @@ --noinst_LTLIBRARIES = libmp4ff.la -+lib_LTLIBRARIES = libmp4ff.la -+ -+include_HEADERS = mp4ff.h - - libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 - -diff -Naur faad2/common/mp4ff/mp4ff.h faad2-libmp4ff/common/mp4ff/mp4ff.h ---- faad2/common/mp4ff/mp4ff.h 2007-11-01 13:33:29.000000000 +0100 -+++ faad2-libmp4ff/common/mp4ff/mp4ff.h 2007-11-02 14:19:30.000000000 +0100 -@@ -35,7 +35,7 @@ - extern "C" { - #endif /* __cplusplus */ - --#include "mp4ff_int_types.h" -+#include <stdint.h> - - /* file callback structure */ - typedef struct diff --git a/source/multimedia/faad2/man.patch b/source/multimedia/faad2/man.patch new file mode 100644 index 0000000..9c1ddb0 --- /dev/null +++ b/source/multimedia/faad2/man.patch @@ -0,0 +1,10 @@ +diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am +--- faad2-2.7.orig/frontend/Makefile.am 2009-02-06 18:03:37.000000000 +0200 ++++ faad2-2.7/frontend/Makefile.am 2009-07-20 20:27:29.000000000 +0300 +@@ -1,5 +1,5 @@ + bin_PROGRAMS = faad +-man_MANS = faad.man ++man1_MANS = faad.man + + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \ + -I$(top_srcdir)/common/mp4ff diff --git a/source/multimedia/faad2/shared.patch b/source/multimedia/faad2/shared.patch new file mode 100644 index 0000000..56a1311 --- /dev/null +++ b/source/multimedia/faad2/shared.patch @@ -0,0 +1,29 @@ +Ripped from Debian + +Patch to create a shared lib for libmp4ff. + +--- a/common/mp4ff/Makefile.am ++++ b/common/mp4ff/Makefile.am +@@ -1,7 +1,8 @@ +-lib_LIBRARIES = libmp4ff.a ++lib_LTLIBRARIES = libmp4ff.la + include_HEADERS = mp4ff.h mp4ffint.h + +-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 ++AM_CFLAGS = -DUSE_TAGGING=1 + +-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ ++libmp4ff_la_LDFLAGS = -version-info 0:0:0 ++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ + mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h +--- a/frontend/Makefile.am ++++ b/frontend/Makefile.am +@@ -5,7 +5,7 @@ + -I$(top_srcdir)/common/mp4ff + + faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ +- $(top_builddir)/common/mp4ff/libmp4ff.a ++ $(top_builddir)/common/mp4ff/libmp4ff.la + + faad_SOURCES = main.c \ + audio.c audio.h \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
