* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2017-07-20 9:35 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-07-20 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 2e7e9afb0dc1b7699b7adb22d8197313eb332c61
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 09:35:11 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 09:35:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7e9afb
media-libs/faad2: Bump to version 2.8.1
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-libs/faad2/Manifest | 1 +
media-libs/faad2/faad2-2.8.1.ebuild | 52 ++++++++++++++++++++++
.../files/faad2-2.8.1-libmp4ff-shared-lib.patch | 25 +++++++++++
3 files changed, 78 insertions(+)
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 5333a9280f8..476a3adb6aa 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 00000000000..5dd4c399bde
--- /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 00000000000..77a77365f3e
--- /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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2017-07-26 11:31 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-07-26 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 662c67880e6d6713d812b4ff37ca7c35e83dc765
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 11:31:02 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 11:31:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662c6788
media-libs/faad2: Revbump adding a dummy version macro.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../faad2/{faad2-2.8.1.ebuild => faad2-2.8.1-r1.ebuild} | 1 +
.../faad2/files/faad2-2.8.1-dummy_version_macro.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/media-libs/faad2/faad2-2.8.1.ebuild b/media-libs/faad2/faad2-2.8.1-r1.ebuild
similarity index 96%
rename from media-libs/faad2/faad2-2.8.1.ebuild
rename to media-libs/faad2/faad2-2.8.1-r1.ebuild
index 5dd4c399bde..559e72c939a 100644
--- a/media-libs/faad2/faad2-2.8.1.ebuild
+++ b/media-libs/faad2/faad2-2.8.1-r1.ebuild
@@ -18,6 +18,7 @@ DEPEND=""
PATCHES=(
"${FILESDIR}"/${PN}-2.8.1-libmp4ff-shared-lib.patch
+ "${FILESDIR}"/${P}-dummy_version_macro.patch
)
src_prepare() {
diff --git a/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch b/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
new file mode 100644
index 00000000000..8a7608b1899
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/faac/faad2/ci/f58984cbceb6dd62589069f9b7e8ae5425c3438c/
+
+--- faad2-2.8.1/include/neaacdec.h
++++ faad2-2.8.1/include/neaacdec.h
+@@ -73,7 +73,7 @@
+ #endif
+ #endif
+
+-#define FAAD2_VERSION PACKAGE_VERSION
++#define FAAD2_VERSION "unknown"
+
+ /* object types for AAC */
+ #define MAIN 1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2017-10-13 13:16 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-10-13 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 37df891e76c13a3fafcd5782b78202b8f28c309b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 13:16:16 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 13:16:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37df891e
media-libs/faad2: Removed old.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-libs/faad2/Manifest | 1 -
media-libs/faad2/faad2-2.8.1-r1.ebuild | 53 ----------------------
.../files/faad2-2.8.1-dummy_version_macro.patch | 13 ------
.../files/faad2-2.8.1-libmp4ff-shared-lib.patch | 25 ----------
4 files changed, 92 deletions(-)
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index d21a026eb47..49b9440a5a8 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,3 @@
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
DIST faad2-2.8.5.tar.gz 1025674 SHA256 ba7364ba8ff9256abb8aa4af8736f27d0b7eaab51c14ff828cc86aabff33ec65 SHA512 bb3445aa82b18688b32d7ac9983e5fbf47b6c717486e58c711483967cbf3887540e8a57840a76e686eb990eae341496457ec39278f1c62256708b2d5ef4587ae WHIRLPOOL dc5023eee9f6d4c6e55ef7697a2e27c7282bbc48ddf9b8643be975067093f452050534eb8dc041cc03da9c97b4a5020002fab96eff52dfe0284adcb579745ff0
DIST faad2-2.8.6.tar.gz 1025654 SHA256 654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8 WHIRLPOOL fcecff8d68c6493c3fd708f3d553884891ba6ac6e7051cee56773dabcf19dca124863ae3195550fc51812445bb5a154bcda561ab6419553c4e7d3cd3e08963e4
diff --git a/media-libs/faad2/faad2-2.8.1-r1.ebuild b/media-libs/faad2/faad2-2.8.1-r1.ebuild
deleted file mode 100644
index 870b51eab5c..00000000000
--- a/media-libs/faad2/faad2-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune 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
- "${FILESDIR}"/${P}-dummy_version_macro.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-dummy_version_macro.patch b/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
deleted file mode 100644
index 8a7608b1899..00000000000
--- a/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/faac/faad2/ci/f58984cbceb6dd62589069f9b7e8ae5425c3438c/
-
---- faad2-2.8.1/include/neaacdec.h
-+++ faad2-2.8.1/include/neaacdec.h
-@@ -73,7 +73,7 @@
- #endif
- #endif
-
--#define FAAD2_VERSION PACKAGE_VERSION
-+#define FAAD2_VERSION "unknown"
-
- /* object types for AAC */
- #define MAIN 1
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
deleted file mode 100644
index 77a77365f3e..00000000000
--- a/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2017-10-13 13:16 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-10-13 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 26faadbb0b707fec5c875279b458920c271da617
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 13:15:01 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 13:15:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26faadbb
media-libs/faad2: Bump to version 2.8.6
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-libs/faad2/Manifest | 1 +
media-libs/faad2/faad2-2.8.6.ebuild | 52 ++++++++++++++++++++++
.../files/faad2-2.8.5-libmp4ff-shared-lib.patch | 6 ++-
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 7a2d71818f8..d21a026eb47 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,3 +1,4 @@
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
DIST faad2-2.8.5.tar.gz 1025674 SHA256 ba7364ba8ff9256abb8aa4af8736f27d0b7eaab51c14ff828cc86aabff33ec65 SHA512 bb3445aa82b18688b32d7ac9983e5fbf47b6c717486e58c711483967cbf3887540e8a57840a76e686eb990eae341496457ec39278f1c62256708b2d5ef4587ae WHIRLPOOL dc5023eee9f6d4c6e55ef7697a2e27c7282bbc48ddf9b8643be975067093f452050534eb8dc041cc03da9c97b4a5020002fab96eff52dfe0284adcb579745ff0
+DIST faad2-2.8.6.tar.gz 1025654 SHA256 654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8 WHIRLPOOL fcecff8d68c6493c3fd708f3d553884891ba6ac6e7051cee56773dabcf19dca124863ae3195550fc51812445bb5a154bcda561ab6419553c4e7d3cd3e08963e4
diff --git a/media-libs/faad2/faad2-2.8.6.ebuild b/media-libs/faad2/faad2-2.8.6.ebuild
new file mode 100644
index 00000000000..3429665fa71
--- /dev/null
+++ b/media-libs/faad2/faad2-2.8.6.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 ltprune 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 TODO )
+RDEPEND=""
+DEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8.5-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.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
index 944b5f8bd61..00ae46c0467 100644
--- a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
+++ b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
@@ -15,10 +15,12 @@
mp4tagupdate.c mp4ff.h mp4ffint.h
--- faad2-2.8.5/frontend/Makefile.am
+++ faad2-2.8.5/frontend/Makefile.am
-@@ -4,6 +4,7 @@
+@@ -3,7 +3,8 @@
+
AM_CPPFLAGS = -I$(top_srcdir)/include
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la
+-faad_LDADD = $(top_builddir)/libfaad/libfaad.la
++faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+ $(top_builddir)/common/mp4ff/libmp4ff.la
faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2020-05-23 10:17 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2020-05-23 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 88469679c770b8742a3649e971fc5522442216c1
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 10:16:40 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 23 10:16:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88469679
media-libs/faad2: Drop old and vulnerable 2.8.8
Bug: https://bugs.gentoo.org/695540
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/faad2/Manifest | 1 -
media-libs/faad2/faad2-2.8.8.ebuild | 53 ----------------------
.../files/faad2-2.8.5-libmp4ff-shared-lib.patch | 15 ------
3 files changed, 69 deletions(-)
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 5c9c31d072c..610d57b524c 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,2 +1 @@
-DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
deleted file mode 100644
index 986d9c87382..00000000000
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.8.5-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() {
- find "${D}" -name '*.la' -delete || die
- einstalldocs
-}
diff --git a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
deleted file mode 100644
index 68b21a966be..00000000000
--- a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- faad2-2.8.5/common/mp4ff/Makefile.am
-+++ faad2-2.8.5/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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/
@ 2023-11-22 17:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-11-22 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 6abca05fd236198f409f23bd6eed74b6a5165de2
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Nov 13 08:10:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 17:33:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abca05f
media-libs/faad2: add 2.11.0
Closes: https://bugs.gentoo.org/859844
Closes: https://bugs.gentoo.org/917031
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33784
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/faad2/Manifest | 1 +
media-libs/faad2/faad2-2.11.0.ebuild | 36 ++++++++++++
.../faad2-2.11.0-check-if-lrintf-is-defined.patch | 64 ++++++++++++++++++++++
3 files changed, 101 insertions(+)
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 05527727aa59..9c8bd3315341 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1 +1,2 @@
DIST faad2-2.10.1.tar.gz 803488 BLAKE2B f25bf9242675250b910bd5540487cf708d6e195e1ddca0b27588678e5fbf2bedf9d41e6bc607aa34bb2dbff95a8a4071e74e2f9bd9493ccb7ef040ce9bf81b4c SHA512 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
+DIST faad2-2.11.0.tar.gz 656610 BLAKE2B 2fdbe4b1c7743952277f699a186197adedd851650ac37ec31292eabed32693611aa75fb207e57bc814c639905285fffe092008e887ae713f5d2f84c4d1c4831a SHA512 b85aab9b2d2afdca7096c999bcb7fabfccce4781760d9eb14d23fdd38691729927b09464708abf49a751e70c4475151ca14c5a7419b5cf4d9ec70c433dc86282
diff --git a/media-libs/faad2/faad2-2.11.0.ebuild b/media-libs/faad2/faad2-2.11.0.ebuild
new file mode 100644
index 000000000000..d706d0296c32
--- /dev/null
+++ b/media-libs/faad2/faad2-2.11.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="https://www.audiocoding.com/faad2.html https://github.com/knik0/faad2/"
+SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# no tests
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/faad2-2.11.0-check-if-lrintf-is-defined.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ )
+
+ cmake-multilib_src_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ # TODO: remove in next release
+ newman frontend/faad.man faad.1
+}
diff --git a/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch b/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch
new file mode 100644
index 000000000000..0d05eb3f04ea
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch
@@ -0,0 +1,64 @@
+https://github.com/knik0/faad2/issues/188
+https://github.com/knik0/faad2/issues/190
+
+From 1001f9576cbb29242671c489cd861de61cfe08e2 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Thu, 9 Nov 2023 08:23:53 +0100
+Subject: [PATCH] check for lrintf() presence and define HAVE_LRINTF
+ accordingly
+
+Fixes #188
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,8 @@
+ # - Solaris 11.4 SRU 15 : 3.15
+ cmake_minimum_required(VERSION 3.15)
+
++include(CheckSymbolExists)
++
+ project(LIBFAAD2 LANGUAGES C)
+
+ # If FAAD is being bundled in another project, we don't want to
+@@ -90,6 +92,13 @@ set(FAAD_DEFINES
+ PACKAGE_VERSION=\"${FAAD_VERSION}\"
+ )
+
++check_symbol_exists(lrintf "math.h" HAVE_LRINTF)
++if(HAVE_LRINTF)
++ list(APPEND FAAD_DEFINES
++ HAVE_LRINTF=1
++ )
++endif()
++
+ set(FAAD_FLAGS
+ -Wall
+ )
+
+From 047fd22172a7ff6974b9ac6ca7e4ffdb1944f2e0 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Fri, 10 Nov 2023 20:01:30 +0100
+Subject: [PATCH] check for lrintf() in -lm and force linking if available
+
+Fixes #190
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ # - Solaris 11.4 SRU 15 : 3.15
+ cmake_minimum_required(VERSION 3.15)
+
++include(CheckLibraryExists)
+ include(CheckSymbolExists)
+
+ project(LIBFAAD2 LANGUAGES C)
+@@ -106,6 +107,11 @@ set(FAAD_DEFINES
+ PACKAGE_VERSION=\"${FAAD_VERSION}\"
+ )
+
++check_library_exists(m lrintf "" HAVE_LIBM)
++if(HAVE_LIBM)
++ list(APPEND CMAKE_REQUIRED_LIBRARIES m)
++endif()
++
+ check_symbol_exists(lrintf "math.h" HAVE_LRINTF)
+ if(HAVE_LRINTF)
+ list(APPEND FAAD_DEFINES
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-11-22 17:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-20 9:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/, media-libs/faad2/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2017-07-26 11:31 Lars Wendler
2017-10-13 13:16 Lars Wendler
2017-10-13 13:16 Lars Wendler
2020-05-23 10:17 James Le Cuirot
2023-11-22 17:44 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox