+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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
-}
+++ /dev/null
-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;
projects / gentoo.git / commitdiff