public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/, media-libs/freeverb3/files/
@ 2017-05-13  9:41 Jeroen Roovers
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-05-13  9:41 UTC (permalink / raw
  To: gentoo-commits

commit:     0c9fc95e689de83fc19a91336b286d2e6ed7e04d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 09:38:38 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 13 09:41:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9fc95e

media-libs/freeverb3: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-libs/freeverb3/Manifest                      |  2 -
 .../files/freeverb3-3.1.1-jack-compilation.patch   | 67 -------------------
 .../files/freeverb3-3.1.1-jack-linking.patch       | 27 --------
 media-libs/freeverb3/freeverb3-2.6.6.ebuild        | 57 ----------------
 media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild     | 75 ----------------------
 media-libs/freeverb3/freeverb3-3.1.1.ebuild        | 70 --------------------
 6 files changed, 298 deletions(-)

diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 91aafd99ad0..4e933c96ec8 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,3 +1 @@
-DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4
-DIST freeverb3-3.1.1.tar.xz 6067288 SHA256 6327b6809f4c15dfc74331f0b88af8d92f593d1bf8eabee15ec2a98217aa8d93 SHA512 83feb43a6c178b82958089a3527788f1426bc76e5a86d353df5818a0ebeb1656742e225d4e3eb3187b768169af1a6f2716215408fdb30869452d10d64a967516 WHIRLPOOL e2ac3bec3f2ba90bfc8f25d9c09290dcdc5e43e4528182cbf112614f9d86e97f27beb13a4869cfe5ac10a29af47e4ed9ab64a064189d57ac1d4282a38442b935
 DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 SHA256 759ba987a6d696a34ce9a5a69ba87687bf678a93de3f49af3ad19df638379ae0 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536 WHIRLPOOL a61cc9d301ddbbede0b9100219d93523ff7cece133f4402b1d82c2c9008d9cd7b2f89a1b94f8f638a298efd5bdc12eed3296618bcd9ab2cee9332cec733c8ea4

diff --git a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch
deleted file mode 100644
index 76878202176..00000000000
--- a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c2ab38ee2cd768ea4875450b146b12edbc28d656 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 9 Jun 2015 01:41:45 +0200
-Subject: [PATCH] Fix function name mis-match for JACK compilation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes compile error:
-
-../audacious/impulser2.cpp: In function ‘void slot_save(SlotConfiguration*, int)’:
-../audacious/impulser2.cpp:278:86: error: ‘aud_set_str’ was not declared in this scope
- t_str   (configSectionString, key_i("file",i), (gchar*)slot->filename.c_str());
-                                                                              ^
-../audacious/impulser2.cpp: In function ‘void slot_load(SlotConfiguration*, int)’:
-../audacious/impulser2.cpp:293:62: error: ‘aud_get_str’ was not declared in this scope
-   filename = aud_get_str(configSectionString, key_i("file",i));
----
- jack/configdb.h        | 4 ++--
- jack/configdb_rcfile.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/jack/configdb.h b/jack/configdb.h
-index c3e6c19..0f793fa 100644
---- a/jack/configdb.h
-+++ b/jack/configdb.h
-@@ -23,13 +23,13 @@ void bmp_cfg_db_set_float (ConfigDb *db, const gchar *section, const gchar *key,
- void bmp_cfg_db_set_double(ConfigDb *db, const gchar *section, const gchar *key, gdouble value);
- void bmp_cfg_db_unset_key (ConfigDb *db, const gchar *section, const gchar *key);
- 
--gchar *  aud_get_string(const gchar *section, const gchar *key);
-+gchar *  aud_get_str   (const gchar *section, const gchar *key);
- gint     aud_get_int   (const gchar *section, const gchar *key);
- gboolean aud_get_bool  (const gchar *section, const gchar *key);
- gfloat   aud_get_float (const gchar *section, const gchar *key);
- gdouble  aud_get_double(const gchar *section, const gchar *key);
- 
--void aud_set_string(const gchar *section, const gchar *key, gchar *value);
-+void aud_set_str   (const gchar *section, const gchar *key, gchar *value);
- void aud_set_int   (const gchar *section, const gchar *key, gint value);
- void aud_set_bool  (const gchar *section, const gchar *key, gboolean value);
- void aud_set_float (const gchar *section, const gchar *key, gfloat value);
-diff --git a/jack/configdb_rcfile.c b/jack/configdb_rcfile.c
-index c0125c8..69bb085 100644
---- a/jack/configdb_rcfile.c
-+++ b/jack/configdb_rcfile.c
-@@ -109,7 +109,7 @@ void bmp_cfg_db_unset_key(ConfigDb * db, const gchar * section, const gchar * ke
- }
- 
- gchar * cfg_string;
--gchar * aud_get_string(const gchar *section, const gchar *key)
-+gchar * aud_get_str(const gchar *section, const gchar *key)
- {
-   ConfigDb * cfg = bmp_cfg_db_open();
-   bmp_cfg_db_get_string(cfg,section,key,&cfg_string);
-@@ -153,7 +153,7 @@ gdouble aud_get_double(const gchar *section, const gchar *key)
-   return cfg_double;
- }
- 
--void aud_set_string(const gchar *section, const gchar *key, gchar *value)
-+void aud_set_str(const gchar *section, const gchar *key, gchar *value)
- {
-   ConfigDb * cfg = bmp_cfg_db_open();
-   bmp_cfg_db_set_string(cfg,section,key,value);
--- 
-2.4.0
-

diff --git a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch
deleted file mode 100644
index d52d6d424fb..00000000000
--- a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e10a2a4eb6985731881ad145eac5e8e8ec45a1fd Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 9 Jun 2015 00:06:51 +0200
-Subject: [PATCH] Fix linking of JACK effect module
-
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../x86_64-pc-linux-gnu/bin/ld: ./.libs/libjack_common.a(libjack_common_la-jack_main.o): undefined
-reference to symbol 'gdk_threads_init'
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../lib64/libgdk-3.so: error adding symbols: DSO missing from command line
----
- jack/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/jack/Makefile.am b/jack/Makefile.am
-index 651a034..a18fe15 100644
---- a/jack/Makefile.am
-+++ b/jack/Makefile.am
-@@ -36,6 +36,7 @@ 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_LIBADD = $(jack_LIBS) $(gtk3_LIBS)
- 
- I_LIBS += libbmp_int.la libjack_common.la
- 
--- 
-2.4.0
-

diff --git a/media-libs/freeverb3/freeverb3-2.6.6.ebuild b/media-libs/freeverb3/freeverb3-2.6.6.ebuild
deleted file mode 100644
index c6028c6a46c..00000000000
--- a/media-libs/freeverb3/freeverb3-2.6.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit multilib versionator
-
-DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
-HOMEPAGE="http://freeverb3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audacious cpu_flags_x86_avx jack plugdouble cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_3dnow forcefpu"
-
-RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? ( <media-sound/audacious-3
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_configure() {
-	# TODO: Expose --enable-pthread (of >=2.6.0) to the outside
-	econf \
-		--enable-release \
-		--disable-bmp \
-		--disable-pluginit \
-		$(use_enable audacious) \
-		$(use_enable jack) \
-		$(use_enable plugdouble) \
-		--disable-autocflags \
-		$(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 forcefpu) \
-		|| 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
-}

diff --git a/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild
deleted file mode 100644
index 65a29fb9d53..00000000000
--- a/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib versionator
-
-DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-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.5*
-		${_GTK_DEPEND}
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		${_GTK_DEPEND}
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-jack-compilation.patch
-	epatch "${FILESDIR}"/${P}-jack-linking.patch
-}
-
-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
-}

diff --git a/media-libs/freeverb3/freeverb3-3.1.1.ebuild b/media-libs/freeverb3/freeverb3-3.1.1.ebuild
deleted file mode 100644
index 923cffd2622..00000000000
--- a/media-libs/freeverb3/freeverb3-3.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib versionator
-
-DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-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.5
-		${_GTK_DEPEND}
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		${_GTK_DEPEND}
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/, media-libs/freeverb3/files/
@ 2017-08-20 17:15 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2017-08-20 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     615ab02fe3729f0e40cd720841205492a5726f5e
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 17:07:59 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 17:15:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615ab02f

media-libs/freeverb3: Fix compilation (bug #625340)

.. for USE="jack [audacious]" with Audacious 3.6+.
Also, bump to EAPI 6 and respect description length limit.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 ...erb3-3.1.2_pre20151102-jack-audacious-3-6.patch | 75 ++++++++++++++++++++++
 .../freeverb3-3.1.2_pre20151102-r1.ebuild          |  6 +-
 .../freeverb3/freeverb3-3.1.2_pre20151102.ebuild   |  2 +-
 3 files changed, 80 insertions(+), 3 deletions(-)

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
new file mode 100644
index 00000000000..a76d08d3194
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch
@@ -0,0 +1,75 @@
+From 1fbb0e7954701cfa5f88eb764a2e18002519a9ce Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.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
index 3a8c04ef181..7bf95fa1c74 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit autotools eutils multilib versionator
 
 MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
-DESCRIPTION="Reverb and Impulse Response Convolution library including Audacious/JACK plugins"
+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"
 
@@ -36,6 +36,8 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 REQUIRED_USE="jack? ( audacious )"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-jack-audacious-3-6.patch
+	eapply_user
 	eautoreconf
 }
 

diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
index fa9972c7194..7ebbab40e26 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit autotools eutils multilib versionator
 
 MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
-DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
+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"
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/, media-libs/freeverb3/files/
@ 2023-01-04 18:25 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2023-01-04 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     da555ac9af37b1afe464cc1e49dbc623388797c2
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 18:23:59 2023 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 18:23:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da555ac9

media-libs/freeverb3: Fix include path in pkg-config file

Closes: https://bugs.gentoo.org/889436
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 .../freeverb3/files/freeverb3-3.2.1-pc-file.patch  | 22 ++++++++++
 media-libs/freeverb3/freeverb3-3.2.1-r4.ebuild     | 48 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/media-libs/freeverb3/files/freeverb3-3.2.1-pc-file.patch b/media-libs/freeverb3/files/freeverb3-3.2.1-pc-file.patch
new file mode 100644
index 000000000000..43ddaf25a5fb
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-3.2.1-pc-file.patch
@@ -0,0 +1,22 @@
+From ecc07dc4f10c2b75e108d8fa7de31324d0e05659 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 4 Jan 2023 19:17:32 +0100
+Subject: [PATCH] pkg-config: Fix include directory
+
+---
+ freeverb3-3.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/freeverb3-3.pc.in b/freeverb3-3.pc.in
+index 8bbfda0..2403467 100644
+--- a/freeverb3-3.pc.in
++++ b/freeverb3-3.pc.in
+@@ -8,4 +8,4 @@ Description: A library for processing audio effect (reverb, impulse response ...
+ Requires: 
+ Version: @VERSION@
+ Libs: @fftw3f_LIBS@ @fftw3_LIBS@ @fftw3l_LIBS@ -L${libdir} -lfreeverb3
+-Cflags: -I${includedir}/libfreeverb3-2 -I${includedir}/libsamplerate2 @fftw3f_CFLAGS@ @fftw3_CFLAGS@ @fftw3l_CFLAGS@
++Cflags: -I${includedir}/libfreeverb3-3 -I${includedir}/libsamplerate2 @fftw3f_CFLAGS@ @fftw3_CFLAGS@ @fftw3l_CFLAGS@
+-- 
+2.39.0
+

diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r4.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r4.ebuild
new file mode 100644
index 000000000000..71ad4905d940
--- /dev/null
+++ b/media-libs/freeverb3/freeverb3-3.2.1-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pc-file.patch  # bug 889436
+)
+
+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
+
+	find "${D}" -name '*.la' -delete || die  # bug 847403
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-01-04 18:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-20 17:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/, media-libs/freeverb3/files/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2023-01-04 18:25 Sebastian Pipping
2017-05-13  9:41 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox