From 55146687ca4ec05fb93e2daa640cb6a668743fbf Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 24 Mar 2020 23:28:52 +0100 Subject: media-libs/freeverb3: Drop masked Jack and Audacious bits to survive Bug: https://bugs.gentoo.org/671828 Signed-off-by: Sebastian Pipping Package-Manager: Portage-2.3.92, Repoman-2.3.20 --- media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild | 64 -------------------------- media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild | 42 +++++++++++++++++ media-libs/freeverb3/metadata.xml | 1 - profiles/base/package.use.stable.mask | 4 -- profiles/package.mask | 6 ++- 5 files changed, 47 insertions(+), 70 deletions(-) delete mode 100644 media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild create mode 100644 media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild deleted file mode 100644 index ad6ce443e98f..000000000000 --- a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)" -HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="audacious forcefpu jack openmp plugdouble threads" - -REQUIRED_USE="jack? ( audacious )" - -_GTK_DEPEND=" - >=dev-libs/glib-2.4.7:2 - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/pango -" -RDEPEND=" - sci-libs/fftw:3.0= - audacious? ( ${_GTK_DEPEND} - =media-sound/audacious-3.9*[gtk3(+)] - media-libs/libsndfile - ) - jack? ( ${_GTK_DEPEND} - virtual/jack - media-libs/libsndfile - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local myeconfargs=( - --enable-release - --enable-undenormal - --disable-autocflags - --disable-pluginit - --disable-profile - --disable-sample - --disable-srcnewcoeffs - $(use_enable audacious) - $(use_enable jack) - $(use_enable openmp omp) - $(use_enable plugdouble) - $(use_enable threads pthread) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - einstalldocs - - if use audacious ; then - find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die - fi - - insinto /usr/share/${PN}/samples/IR - doins samples/IR/*.wav -} diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild new file mode 100644 index 000000000000..956f16ac14ea --- /dev/null +++ b/media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)" +HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="forcefpu openmp plugdouble threads" + +RDEPEND="sci-libs/fftw:3.0=" +DEPEND="${RDEPEND}" + +src_configure() { + local myeconfargs=( + --enable-release + --enable-undenormal + --disable-autocflags + --disable-pluginit + --disable-profile + --disable-sample + --disable-srcnewcoeffs + --disable-audacious + --disable-jack + $(use_enable openmp omp) + $(use_enable plugdouble) + $(use_enable threads pthread) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs + + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav +} diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml index c5d214afe1db..5a8e3e767be9 100644 --- a/media-libs/freeverb3/metadata.xml +++ b/media-libs/freeverb3/metadata.xml @@ -10,7 +10,6 @@ Gentoo Sound project - Build Audacious plugin Disable assembly code Build plugins in double precision mode (default is float) diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 419ade28d380..03f6afbc88e0 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -136,10 +136,6 @@ app-backup/backup-manager s3 # Requires stable phpunit dev-php/PEAR-Text_Password test -# Andreas K. Hüttel (2017-11-04) -# Requires audacious, which is masked. Bug 632513 -media-libs/freeverb3 audacious jack - # Andreas Sturmlechner (2017-10-22) # Requires unmaintained unstable dependency net-libs/gloox. # The go flag requires stable masked dev-lang/go[gccgo]. diff --git a/profiles/package.mask b/profiles/package.mask index b049823d8031..011c9fe0f661 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -52,7 +52,11 @@ x11-misc/xplanetFX # Package appears dead upstream, purpose unclear after media-sound/audacious-3.9 # is gone, bug #671828. GTK2 (3.10.1) or Qt5 (4.0) version of Audacious remains. # Masked for removal in 30 days. -media-libs/freeverb3 +# +# Sebastian Pipping (2020-03-24) +# Audacious aspect dropped from Freeverb3 ebuild now so that +# package media-libs/freeverb3 can live on. +# Keeping Audacious 3.9* masked for removal as before. =media-sound/audacious-3.9* =media-plugins/audacious-plugins-3.9* -- cgit v1.2.3-65-gdbad