3 files changed, 78 insertions, 0 deletions
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 5333a9280f84..476a3adb6aac 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1 +1,2 @@
 DIST faad2-2.7.tar.gz 1137407 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 WHIRLPOOL 6e30d466e47de0e06751718005573a632c5aa0cd209445c56c25d859f917265452676ce897ac5ad1cd308d411911aaf232bfc50904469f9434b2cc95b6ae928f
+DIST faad2-2.8.1.tar.gz 802453 SHA256 133270a9be0c9ab8fea18017703ab4a94f9eddbb45a8aa6a511a1469fa413591 SHA512 102271e72b3d2f7f043f89d503ff8bf32c276001510055d8db5d9242fe51004ba727b33180134773fc77b2498ee61fe84a1a8db45705200ce79e4aa06b9da9ee WHIRLPOOL 5303692dcdac21d64ae6db0aa71c5ecbac7550a8227d5ea163374f15ee0433f7221ccb683f67ffa2ffe4dbbe3b8f0bad226cec7a99e264cd8a1022896d60915e
diff --git a/media-libs/faad2/faad2-2.8.1.ebuild b/media-libs/faad2/faad2-2.8.1.ebuild
new file mode 100644
index 000000000000..5dd4c399bdee
--- /dev/null
+++ b/media-libs/faad2/faad2-2.8.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="digitalradio static-libs"
+DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
+RDEPEND=""
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.1-libmp4ff-shared-lib.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
+
+	# bug 466986
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--without-xmms
+		$(use_with digitalradio drm)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# do not build the frontend for non default abis
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		sed -i -e 's/frontend//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch
new file mode 100644
index 000000000000..77a77365f3e2
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch
@@ -0,0 +1,25 @@
+--- faad2-2.8.1/common/mp4ff/Makefile.am
++++ faad2-2.8.1/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-noinst_LIBRARIES = libmp4ff.a
+-noinst_HEADERS = mp4ff.h mp4ffint.h
++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
+--- faad2-2.8.1/frontend/Makefile.am
++++ faad2-2.8.1/frontend/Makefile.am
+@@ -4,6 +4,6 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/include -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