diff options
| author | Vlad Glagolev | 2009-08-31 05:26:25 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2009-08-31 05:26:25 +0400 |
| commit | eeb99b0df52d6ae6a11b22e402337792171939af (patch) | |
| tree | 629bb194d0256f07f4e772eeb94d6227ba56a0b7 | |
| parent | 978bce66802428690e4b5705e3d69cb4096a2b04 (diff) | |
faad2: more fixes for the spell
| -rw-r--r-- | audio-libs/faad2/HISTORY | 2 | ||||
| -rwxr-xr-x | audio-libs/faad2/PRE_BUILD | 4 | ||||
| -rw-r--r-- | audio-libs/faad2/libmp4ff.patch | 25 | ||||
| -rw-r--r-- | audio-libs/faad2/man.patch | 9 |
4 files changed, 40 insertions, 0 deletions
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY index a48cd71ef2..c1b0fa8fe9 100644 --- a/audio-libs/faad2/HISTORY +++ b/audio-libs/faad2/HISTORY @@ -4,6 +4,8 @@ * PRE_BUILD: removed patch-applying * faad2-enable-drm.patch: removed, don't force drm support since it's _broken_ + * man.patch: added, to properly install a manual + * libmp4ff.patch: added, to build a shared lib for libmp4ff 2009-03-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * UP_TRIGGERS: detect the latest soname change too diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD index 1a8d4c1fa4..76b14f15e9 100755 --- a/audio-libs/faad2/PRE_BUILD +++ b/audio-libs/faad2/PRE_BUILD @@ -1,4 +1,8 @@ default_pre_build && cd $SOURCE_DIRECTORY && + +patch -p0 < "$SPELL_DIRECTORY/man.patch" && +patch -p0 < "$SPELL_DIRECTORY/libmp4ff.patch" && + sedit 's/^AC_PROG_CPP$/AC_PROG_CXX/' configure.in && /bin/sh ./bootstrap diff --git a/audio-libs/faad2/libmp4ff.patch b/audio-libs/faad2/libmp4ff.patch new file mode 100644 index 0000000000..4a3f7d5561 --- /dev/null +++ b/audio-libs/faad2/libmp4ff.patch @@ -0,0 +1,25 @@ +--- common/mp4ff/Makefile.am.orig ++++ 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 +--- frontend/Makefile.am.orig ++++ 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 \ diff --git a/audio-libs/faad2/man.patch b/audio-libs/faad2/man.patch new file mode 100644 index 0000000000..e1d5c5382c --- /dev/null +++ b/audio-libs/faad2/man.patch @@ -0,0 +1,9 @@ +--- frontend/Makefile.am.orig ++++ frontend/Makefile.am +@@ -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 |