[gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/files/, media-libs/freeverb3/

[Andreas Sturmlechner]

commit:     f1aec77c19b636d9b7ebe663275473ba1382134a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 00:30:44 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 00:32:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1aec77c

media-libs/freeverb3: Drop 3.1.2_pre20151102

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/freeverb3/Manifest                      |  1 -
 ...erb3-3.1.2_pre20151102-jack-audacious-3-6.patch | 75 --------------------
 .../freeverb3-3.1.2_pre20151102-r1.ebuild          | 79 ----------------------
 3 files changed, 155 deletions(-)

diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 706d31c95ab..abe29d87cad 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,3 +1,2 @@
 DIST freeverb3-3.1.2.tar.xz 6015544 BLAKE2B 7589e7aeb04f2253124c94036b53cb86151ffb9f53ae1caefd932ac4ea2c75063a3697101c481e89b7a978044eb02849541b11a7064ede2aec1cd92beba54ad6 SHA512 d3c0b64f14e98f3641b593f3902017fcb457d7a920082bc31e4fc70aaaa11e9172ecabe56bd93c1722b4860239e5ac127c11da6ced6f708def440018451d86bd
-DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 BLAKE2B 114089be0829e3f1ac36e43e43f455f020e0c72ee6e8e66e1dc2571b8715e56bbdf3b71aa332c3451d511ea4695d6b11a08fb11c9a0e8876ed2556a964be38d9 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536
 DIST freeverb3-3.2.1.tar.xz 6031592 BLAKE2B 8fbabde0e1c359048f4dc2595729ba93323c1f41176aedfaef406b10c570fc15913a63383f5dd054163efc1f2924958871a8e23d5d7edd0d5e07d52553bc7e38 SHA512 7cab3b2389c8d0a60d0c5f809b214677221204727a74a2b8622455b579aa8fcbd6952da3a343d0ff4bd06a386bbaed0371ddac99bb8ee85862b62435eaeba21b

diff --git a/media-libs/freeverb3/files/freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch b/media-libs/freeverb3/files/freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch
deleted file mode 100644
index a76d08d3194..00000000000
--- a/media-libs/freeverb3/files/freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1fbb0e7954701cfa5f88eb764a2e18002519a9ce Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@×××××××.org>
-Date: Sun, 20 Aug 2017 18:42:17 +0200
-Subject: [PATCH] Fix JACK compilation for Audacious 3.6+
-
----
- audacious/impulser2.cpp |  2 +-
- jack/Makefile.am        | 20 ++++++++++++++++++--
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/audacious/impulser2.cpp b/audacious/impulser2.cpp
-index bc7d4de..b2ae0a8 100644
---- a/audacious/impulser2.cpp
-+++ b/audacious/impulser2.cpp
-@@ -301,7 +301,7 @@ static void slot_load(SlotConfiguration * slot, int i)
-   slot->limit =   aud_get_double (configSectionString, key_i("limit",i));
-   slot->idelay =  aud_get_double (configSectionString, key_i("idelay",i));
-   slot->i1o2_index = aud_get_int (configSectionString, key_i("i1o2_index",i));
--  #ifdef AUDACIOUS36
-+  #if defined(AUDACIOUS36) && ! defined(JACK)
-   filename = aud_get_str(configSectionString, key_i("file",i)).to_raw();
-   #else
-   filename = aud_get_str(configSectionString, key_i("file",i));
-diff --git a/jack/Makefile.am b/jack/Makefile.am
-index 58527d6..0512828 100644
---- a/jack/Makefile.am
-+++ b/jack/Makefile.am
-@@ -26,6 +26,10 @@ include $(top_srcdir)/audacious/plugins.make
- 
- AM_CPPFLAGS += $(jack_CFLAGS) $(gtk3_CFLAGS) -I$(top_srcdir)/samples
- 
-+if BUILD_AUDACIOUS36
-+AM_CPPFLAGS += -DAUDACIOUS36 -fvisibility=hidden
-+endif
-+
- if BUILD_JACK
- noinst_LTLIBRARIES = libbmp_int.la libjack_common.la
- bin_PROGRAMS = fv3_jack_strev fv3_jack_nrev fv3_jack_revmodel fv3_jack_impulser2 fv3_jack_mbcomp fv3_jack_stenh \
-@@ -35,9 +39,15 @@ endif
- libbmp_int_la_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
- libbmp_int_la_SOURCES = configdb.h configdb_rcfile.c rcfile.c rcfile.h util.c util.h
- libjack_common_la_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
--libjack_common_la_SOURCES = plugin.h jack_main.cpp ../samples/CArg.cpp ../samples/CArg.hpp ../audacious/so.c
-+libjack_common_la_SOURCES = plugin.h jack_main.cpp ../samples/CArg.cpp ../samples/CArg.hpp
- libjack_common_la_LIBADD = $(jack_LIBS) $(gtk3_LIBS)
- 
-+if BUILD_AUDACIOUS36
-+libjack_common_la_SOURCES += ../audacious/so36.cpp
-+else
-+libjack_common_la_SOURCES += ../audacious/so.c
-+endif
-+
- I_LIBS += libbmp_int.la libjack_common.la
- 
- fv3_jack_strev_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
-@@ -54,9 +64,15 @@ fv3_jack_revmodel_LDADD = $(I_LIBS)
- 
- fv3_jack_impulser2_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
- fv3_jack_impulser2_SOURCES = ../audacious/CFileLoader.hpp  ../audacious/CFileLoader_t.hpp ../audacious/impulser2.cpp \
-- ../audacious/wave.xpm ../audacious/so.c
-+ ../audacious/wave.xpm
- fv3_jack_impulser2_LDADD = $(I_LIBS) $(top_builddir)/libgdither/libgdither.la $(sndfile_LIBS)
- 
-+if BUILD_AUDACIOUS36
-+fv3_jack_impulser2_SOURCES += ../audacious/so36.cpp
-+else
-+fv3_jack_impulser2_SOURCES += ../audacious/so.c
-+endif
-+
- fv3_jack_mbcomp_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
- fv3_jack_mbcomp_SOURCES = ../audacious/compressor.cpp
- fv3_jack_mbcomp_LDADD = $(I_LIBS)
--- 
-2.13.2
-

diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
deleted file mode 100644
index 99aab4c4be8..00000000000
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib versionator
-
-MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
-DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
-
-_GTK_DEPEND=">=dev-libs/glib-2.4.7:2
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/pango
-	x11-libs/cairo"
-
-RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? ( >=media-sound/audacious-3.7[gtk3]
-		${_GTK_DEPEND}
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		${_GTK_DEPEND}
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-REQUIRED_USE="jack? ( audacious )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-jack-audacious-3-6.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-profile \
-		--enable-release \
-		--disable-autocflags \
-		--enable-undenormal \
-		$(use_enable threads pthread) \
-		$(use_enable forcefpu) \
-		--disable-force3dnow \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		--disable-fma \
-		--disable-fma4 \
-		$(use_enable openmp omp) \
-		--disable-sample \
-		$(use_enable jack) \
-		$(use_enable audacious) \
-		--disable-srcnewcoeffs \
-		$(use_enable plugdouble) \
-		--disable-pluginit \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README || die 'dodoc failed'
-
-	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 || die
-}