[gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/

[Andreas Sturmlechner]

commit:     f787c8c9d315709ee96ebaaa1b360cc17e6e4781
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 15:11:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 15:29:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f787c8c9

media-plugins/calf: Drop 0.0.60-r1, 0.90.0-r2

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

 media-plugins/calf/Manifest                      |  1 -
 media-plugins/calf/calf-0.0.60-r1.ebuild         | 50 ------------------
 media-plugins/calf/calf-0.90.0-r2.ebuild         | 64 ----------------------
 media-plugins/calf/files/calf-0.0.60-cpp14.patch | 67 ------------------------
 4 files changed, 182 deletions(-)

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 67eda6b3569..7383bc629ed 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,3 +1,2 @@
-DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
 DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
 DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff

diff --git a/media-plugins/calf/calf-0.0.60-r1.ebuild b/media-plugins/calf/calf-0.0.60-r1.ebuild
deleted file mode 100644
index 993a346da86..00000000000
--- a/media-plugins/calf/calf-0.0.60-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="http://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="lash lv2 static-libs experimental"
-
-RDEPEND="dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	gnome-base/libglade:2.0
-	media-sound/fluidsynth
-	virtual/jack
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cpp14.patch" # bug #594116
-)
-
-src_configure() {
-	myeconfargs=(
-		--with-lv2-dir=/usr/$(get_libdir)/lv2
-		$(use_with lash)
-		$(use_with lv2)
-		$(use_enable experimental)
-	)
-	autotools-utils_src_configure
-}

diff --git a/media-plugins/calf/calf-0.90.0-r2.ebuild b/media-plugins/calf/calf-0.90.0-r2.ebuild
deleted file mode 100644
index f39ee8bb02a..00000000000
--- a/media-plugins/calf/calf-0.90.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="http://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
-
-RDEPEND="dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth
-	jack? ( virtual/jack )
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gdk-pixbuf
-		x11-libs/pango
-	)
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# automagic...
-	#$(use_with gtk gui)
-	#$(use_with jack)
-	econf \
-		--prefix="${EPREFIX}"/usr \
-		--without-obsolete-check \
-		$(use_with lash) \
-		$(use_with lv2 lv2) \
-		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable experimental)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/media-plugins/calf/files/calf-0.0.60-cpp14.patch b/media-plugins/calf/files/calf-0.0.60-cpp14.patch
deleted file mode 100644
index a04043c8abc..00000000000
--- a/media-plugins/calf/files/calf-0.0.60-cpp14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Fix building with C++14 (default in GCC 6). Changes types (mostly float into
-double). Add necessary casts.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594116
-
---- a/src/analyzer.cpp
-+++ b/src/analyzer.cpp
-@@ -470,13 +470,13 @@
-                                 lastoutL = fft_outL[_iter];
-                                 //pumping up actual signal an erase surrounding
-                                 // sounds
--                                fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \
-+                                fft_outL[_iter] = 0.25 * std::max(n * 0.6 * \
-                                     fabs(fft_outL[_iter]) - var1L , 1e-20);
-                                 if(_mode == 3 or _mode == 4) {
-                                     // do the same with R channel if needed
-                                     lastoutR = fft_outR[_iter];
--                                    fft_outR[_iter] = 0.25f * std::max(n * \
--                                        0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20);
-+                                    fft_outR[_iter] = 0.25 * std::max(n * \
-+                                        0.6 * fabs(fft_outR[_iter]) - var1R , 1e-20);
-                                 }
-                                 break;
-                         }
---- a/src/jack_client.cpp
-+++ b/src/jack_client.cpp
-@@ -226,7 +226,7 @@
-                 map<string, int>::const_iterator p = port_to_plugin.find((*k) + cnlen + 1);
-                 if (p != port_to_plugin.end())
-                 {
--                    run_before.insert(make_pair<int, int>(p->second, i));
-+                    run_before.insert(make_pair<int, int>((int)p->second, (int)i));
-                 }
-             }
-             jack_free(conns);
---- a/src/modules_dist.cpp
-+++ b/src/modules_dist.cpp
-@@ -794,8 +794,8 @@
-             lfo2.advance(1);
-             
-             // dot
--            rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2);
--            input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2);
-+            rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2.0);
-+            input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2.0);
-             
-             float values[] = {inL, inR, outs[0][i], outs[1][i]};
-             meters.process(values);
---- a/src/modules_limit.cpp
-+++ b/src/modules_limit.cpp
-@@ -429,7 +429,7 @@
-                 }
-                 
-                 // write multiband coefficient to buffer
--                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
-+                buffer[pos] = std::min((double)*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
-                 
-                 // step forward in multiband buffer
-                 pos = (pos + channels) % buffer_size;
-@@ -811,7 +811,7 @@
-                 }
-                 
-                 // write multiband coefficient to buffer
--                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
-+                buffer[pos] = std::min((double)*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
-                 
-                 // step forward in multiband buffer
-                 pos = (pos + channels) % buffer_size;