From d42031b7dffd924e259a67a4cfc70f94c3ae3046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Sun, 2 Aug 2020 10:28:43 +0200 Subject: media-libs/libmad: fixed wrong version in mad.pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc --- media-libs/libmad/files/mad.pc | 2 +- media-libs/libmad/libmad-0.15.1b-r10.ebuild | 82 +++++++++++++++++++++++++++++ media-libs/libmad/libmad-0.15.1b-r9.ebuild | 80 ---------------------------- 3 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 media-libs/libmad/libmad-0.15.1b-r10.ebuild delete mode 100644 media-libs/libmad/libmad-0.15.1b-r9.ebuild diff --git a/media-libs/libmad/files/mad.pc b/media-libs/libmad/files/mad.pc index 14a66f552582..329276cdeec6 100644 --- a/media-libs/libmad/files/mad.pc +++ b/media-libs/libmad/files/mad.pc @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: mad Description: MPEG Audio Decoder Requires: -Version: 0.15.0b +Version: %VERSION% Libs: -L${libdir} -lmad -lm Cflags: -I${includedir} diff --git a/media-libs/libmad/libmad-0.15.1b-r10.ebuild b/media-libs/libmad/libmad-0.15.1b-r10.ebuild new file mode 100644 index 000000000000..285cf5467f48 --- /dev/null +++ b/media-libs/libmad/libmad-0.15.1b-r10.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library" +HOMEPAGE="http://mad.sourceforge.net" +SRC_URI="mirror://sourceforge/mad/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="debug static-libs" + +DEPEND="" +RDEPEND="" + +DOCS=( CHANGES CREDITS README TODO VERSION ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/mad.h +) + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-cflags-O2.patch + "${FILESDIR}"/${P}-gcc44-mips-h-constraint-removal.patch + "${FILESDIR}"/${P}-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch +) + +src_prepare() { + default + + # bug 467002 + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac || die + + eautoreconf +} + +multilib_src_configure() { + # --enable-speed optimize for speed over accuracy + # --enable-accuracy optimize for accuracy over speed + # --enable-experimental enable code using the EXPERIMENTAL + # preprocessor define + local myconf=( + --enable-accuracy + $(use_enable debug debugging) + $(use_enable static-libs static) + ) + + # Fix for b0rked sound on sparc64 (maybe also sparc32?) + # default/approx is also possible, uses less cpu but sounds worse + use sparc && myconf+=( --enable-fpm=64bit ) + + [[ $(tc-arch) == "amd64" ]] && myconf+=( --enable-fpm=64bit ) + [[ $(tc-arch) == "x86" ]] && myconf+=( --enable-fpm=intel ) + [[ $(tc-arch) == "ppc" ]] && myconf+=( --enable-fpm=default ) + [[ $(tc-arch) == "ppc64" ]] && myconf+=( --enable-fpm=64bit ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # This file must be updated with each version update + insinto /usr/$(get_libdir)/pkgconfig + cp "${FILESDIR}/mad.pc" "${S}" + sed -i "s/%VERSION%/${PV}/g" "${S}/mad.pc" + doins "${S}/mad.pc" + + # Use correct libdir in pkgconfig file + sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/mad.pc +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild deleted file mode 100644 index 856aa42c5f77..000000000000 --- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library" -HOMEPAGE="http://mad.sourceforge.net" -SRC_URI="mirror://sourceforge/mad/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="debug static-libs" - -DEPEND="" -RDEPEND="" - -DOCS=( CHANGES CREDITS README TODO VERSION ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/mad.h -) - -PATCHES=( - "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-cflags-O2.patch - "${FILESDIR}"/${P}-gcc44-mips-h-constraint-removal.patch - "${FILESDIR}"/${P}-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch -) - -src_prepare() { - default - - # bug 467002 - sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac || die - - eautoreconf -} - -multilib_src_configure() { - # --enable-speed optimize for speed over accuracy - # --enable-accuracy optimize for accuracy over speed - # --enable-experimental enable code using the EXPERIMENTAL - # preprocessor define - local myconf=( - --enable-accuracy - $(use_enable debug debugging) - $(use_enable static-libs static) - ) - - # Fix for b0rked sound on sparc64 (maybe also sparc32?) - # default/approx is also possible, uses less cpu but sounds worse - use sparc && myconf+=( --enable-fpm=64bit ) - - [[ $(tc-arch) == "amd64" ]] && myconf+=( --enable-fpm=64bit ) - [[ $(tc-arch) == "x86" ]] && myconf+=( --enable-fpm=intel ) - [[ $(tc-arch) == "ppc" ]] && myconf+=( --enable-fpm=default ) - [[ $(tc-arch) == "ppc64" ]] && myconf+=( --enable-fpm=64bit ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # This file must be updated with each version update - insinto /usr/$(get_libdir)/pkgconfig - doins "${FILESDIR}"/mad.pc - - # Use correct libdir in pkgconfig file - sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \ - -i "${ED}"/usr/$(get_libdir)/pkgconfig/mad.pc -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} -- cgit v1.2.3