summaryrefslogtreecommitdiffstats
path: root/audio-libs
diff options
context:
space:
mode:
Diffstat (limited to 'audio-libs')
-rwxr-xr-xaudio-libs/faad2/DETAILS5
-rw-r--r--audio-libs/faad2/HISTORY6
-rwxr-xr-xaudio-libs/faad2/PRE_BUILD8
-rwxr-xr-xaudio-libs/faad2/UP_TRIGGERS17
-rw-r--r--audio-libs/faad2/libmp4ff.patch25
-rw-r--r--audio-libs/faad2/man.patch9
6 files changed, 10 insertions, 60 deletions
diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index 70633120ba..9378edb49d 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -8,9 +8,8 @@ if [ "$FAAD2_BRANCH" = "scm" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- VERSION=2.7
- PATCHLEVEL=1
- SOURCE_HASH=sha512:8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
+ VERSION=2.8.0
+ SOURCE_HASH=sha512:a12a4f734d396f7e574bdd1d33f01592c635710d90ff91208ec1e75a62ead72ce22ba0194da50bc44ffa6ddb87955a1ba4ec8e4106e65de322bfe981478fb014
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/faac/$SOURCE
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 05a6873ef2..e89bf9e5fe 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,9 @@
+2019-01-19 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.8.0
+ * PRE_BUILD: clean
+ * *.patch: deleted
+ * UP_TRIGGERS: deleted
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD
index ab5e782152..0e93d06ae6 100755
--- a/audio-libs/faad2/PRE_BUILD
+++ b/audio-libs/faad2/PRE_BUILD
@@ -1,9 +1,5 @@
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 &&
-sedit 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in &&
+#sedit 's/^AC_PROG_CPP$/AC_PROG_CXX/' configure.in &&
+#sedit 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in &&
/bin/sh ./bootstrap
diff --git a/audio-libs/faad2/UP_TRIGGERS b/audio-libs/faad2/UP_TRIGGERS
deleted file mode 100755
index fbb6c39d92..0000000000
--- a/audio-libs/faad2/UP_TRIGGERS
+++ /dev/null
@@ -1,17 +0,0 @@
-# up_trigger stuff using old faad api
-
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ $OLD_SPELL_VERSION != $VERSION ]]; then
- [[ $VERSION == 2.6.1 ]] || [[ $VERSION == 2.7 ]] || return
- message "This is a possibly incompatible update of faad2..."
- message "Figuring out what spells need to be recast, this may take a while."
- for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -a 2> /dev/null |
- grep -q "faacDec\|libfaad.so.0"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi
diff --git a/audio-libs/faad2/libmp4ff.patch b/audio-libs/faad2/libmp4ff.patch
deleted file mode 100644
index 4a3f7d5561..0000000000
--- a/audio-libs/faad2/libmp4ff.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index e1d5c5382c..0000000000
--- a/audio-libs/faad2/man.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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