From 5636342e6ee0aa28085e55fe5ff1111c220c7ea8 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 10 Sep 2022 08:52:55 +0100 Subject: media-libs/libmp3splt: EAPI 8, fix warnings, add media-libs/flac subslot dep media-libs/flac-1.4.0 breaks ABI. Signed-off-by: Sam James --- .../files/libmp3splt-0.9.2-fix-implicit-decl.patch | 22 +++++++ media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild | 68 ---------------------- media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild | 68 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 68 deletions(-) delete mode 100644 media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild create mode 100644 media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild (limited to 'media-libs/libmp3splt') diff --git a/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch b/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch index 16420e934f57..c5f1fe1f10aa 100644 --- a/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch +++ b/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch @@ -302,3 +302,25 @@ #include #include "splt.h" +--- a/plugins/mp3.c ++++ b/plugins/mp3.c +@@ -28,6 +28,8 @@ + The Plug-in that handles mp3 files + */ + ++#include ++ + #include "splt.h" + #include "cddb_cue_common.h" + +--- a/plugins/mp3_utils.c ++++ b/plugins/mp3_utils.c +@@ -63,6 +63,8 @@ + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *********************************************************/ + ++#include ++ + #include "mp3_utils.h" + + //! Initializes a stream frame diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild deleted file mode 100644 index a7a142a80879..000000000000 --- a/media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="Library for mp3splt to split mp3 and ogg files without decoding" -HOMEPAGE="http://mp3splt.sourceforge.net/mp3splt_page/home.php" -SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86" -IUSE="doc flac pcre" - -RDEPEND=" - media-libs/libmad - media-libs/libid3tag:= - media-libs/libogg - media-libs/libvorbis - flac? ( media-libs/flac ) - pcre? ( dev-libs/libpcre ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - >=app-doc/doxygen-1.8.3.1 - media-gfx/graphviz - ) -" - -DOCS=( AUTHORS ChangeLog LIMITS NEWS README TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.2-drop-libltdl.patch - "${FILESDIR}"/${PN}-0.9.2-fix-implicit-decl.patch - "${FILESDIR}"/CVE-2017-15185.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Breaks consumers like media-sound/libmp3splt otherwise - # bug #778476 - append-libs -ldl - - local myeconfargs=( - --disable-cutter # TODO package cutter - --disable-optimise - --disable-static - $(use_enable doc doxygen_doc) - $(use_enable flac) - $(use_enable pcre) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild new file mode 100644 index 000000000000..bb6d0c64135c --- /dev/null +++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Library for mp3splt to split mp3 and ogg files without decoding" +HOMEPAGE="http://mp3splt.sourceforge.net/mp3splt_page/home.php" +SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86" +IUSE="doc flac pcre" + +RDEPEND=" + media-libs/libmad + media-libs/libid3tag:= + media-libs/libogg + media-libs/libvorbis + flac? ( media-libs/flac:= ) + pcre? ( dev-libs/libpcre ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + >=app-doc/doxygen-1.8.3.1 + media-gfx/graphviz + ) +" + +DOCS=( AUTHORS ChangeLog LIMITS NEWS README TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.2-drop-libltdl.patch + "${FILESDIR}"/${PN}-0.9.2-fix-implicit-decl.patch + "${FILESDIR}"/CVE-2017-15185.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Breaks consumers like media-sound/libmp3splt otherwise + # bug #778476 + append-libs -ldl + + local myeconfargs=( + --disable-cutter # TODO package cutter + --disable-optimise + --disable-static + $(use_enable doc doxygen_doc) + $(use_enable flac) + $(use_enable pcre) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg + + find "${ED}" -type f -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad