* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2016-09-18 13:29 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2016-09-18 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 92beeeaf95ae2ad45c15f2829ab5b2317ac04589
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Sun Sep 18 11:05:33 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:28:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92beeeaf
media-plugins/calf: fix cpp14 compilation errors, bug #594116
Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=594116
Change types of some numbers:
* from float to double
* casts some variables to types required by context
Closes: https://github.com/gentoo/gentoo/pull/2356
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-plugins/calf/calf-0.0.60.ebuild | 4 ++
media-plugins/calf/files/calf-0.0.60-cpp14.patch | 67 ++++++++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/media-plugins/calf/calf-0.0.60.ebuild b/media-plugins/calf/calf-0.0.60.ebuild
index 3a0b806..f4a90b7 100644
--- a/media-plugins/calf/calf-0.0.60.ebuild
+++ b/media-plugins/calf/calf-0.0.60.ebuild
@@ -36,6 +36,10 @@ RDEPEND="dev-libs/atk
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${P}-cpp14.patch" # bug #594116
+)
+
src_configure() {
myeconfargs=(
--with-lv2-dir=/usr/$(get_libdir)/lv2
diff --git a/media-plugins/calf/files/calf-0.0.60-cpp14.patch b/media-plugins/calf/files/calf-0.0.60-cpp14.patch
new file mode 100644
index 00000000..a04043c
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.0.60-cpp14.patch
@@ -0,0 +1,67 @@
+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;
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2019-03-10 22:46 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-03-10 22:46 UTC (permalink / raw
To: gentoo-commits
commit: a526be6165eb8225aa164dc213338267d2c065b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 17:02:49 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 22:45:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a526be61
media-plugins/calf: 0.90.1 version bump, EAPI-7 bump, various QA
Fix automagic
Fix desktop file
Fix htmldir
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.90.1.ebuild | 76 ++++++++++++++++++++++
media-plugins/calf/files/calf-0.90.1-desktop.patch | 24 +++++++
media-plugins/calf/files/calf-0.90.1-htmldir.patch | 66 +++++++++++++++++++
.../calf/files/calf-0.90.1-no-automagic.patch | 43 ++++++++++++
5 files changed, 210 insertions(+)
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index d665e74d184..67eda6b3569 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,2 +1,3 @@
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.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
new file mode 100644
index 00000000000..d9425ffcaa7
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+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 experimental gtk jack lash lv2 static-libs"
+
+REQUIRED_USE="jack? ( gtk )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ media-sound/fluidsynth:=
+ gtk? (
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )
+ lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-automagic.patch"
+ "${FILESDIR}/${P}-htmldir.patch"
+ "${FILESDIR}/${P}-desktop.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --prefix="${EPREFIX}"/usr
+ --without-obsolete-check
+ $(use_enable experimental)
+ $(use_enable gtk gui)
+ $(use_enable jack)
+ $(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)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ mv "${ED}"/usr/share/bash-completion/completions/calf \
+ "${ED}"/usr/share/bash-completion/completions/calfjackhost
+}
diff --git a/media-plugins/calf/files/calf-0.90.1-desktop.patch b/media-plugins/calf/files/calf-0.90.1-desktop.patch
new file mode 100644
index 00000000000..93fc125e011
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.1-desktop.patch
@@ -0,0 +1,24 @@
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ *
+ * /usr/share/applications/calf.desktop: error: value "0.90.1" for key "Version" in group "Desktop Entry" is not a known version
+ * /usr/share/applications/calf.desktop: warning: value "Application;AudioVideo;Audio;GNOME" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+
+
+--- a/calf.desktop.in 2018-07-08 12:35:56.000000000 +0200
++++ b/calf.desktop.in 2019-03-10 20:19:01.251946945 +0100
+@@ -3,7 +3,6 @@
+ Name[pl]=Zestaw wtyczek Calf
+ Name[ru]=Набор эффектов и инструментов Calf для JACK
+ Name[fr]=Ensemble de greffons Calf pour JACK
+-Version=@VERSION@
+ Comment=Process and produce sounds using a set of plugins with JACK interface
+ Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
+ Comment[ru]=Обработка и создание музыки при помощи эффектов и инструментов через JACK
+@@ -11,5 +10,5 @@
+ Exec=calfjackhost
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Audio;GNOME
++Categories=AudioVideo;Audio;GNOME
+ Icon=calf
diff --git a/media-plugins/calf/files/calf-0.90.1-htmldir.patch b/media-plugins/calf/files/calf-0.90.1-htmldir.patch
new file mode 100644
index 00000000000..83481b11288
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.1-htmldir.patch
@@ -0,0 +1,66 @@
+Make PKGDOCDIR configurable for distributions.
+
+--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200
++++ b/configure.ac 2019-03-10 20:11:45.053432800 +0100
+@@ -227,7 +227,7 @@
+
+ # Other defines
+ AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
+-AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
++AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory])
+
+ ############################################################################################
+
+--- a/Makefile.am 2018-07-08 12:35:56.000000000 +0200
++++ b/Makefile.am 2019-03-10 20:55:12.448824164 +0100
+@@ -25,29 +25,29 @@
+ rm -rf autom4te.cache
+
+ install-data-local:
+- install -d -m 755 $(DESTDIR)$(docdir)
+- install -d -m 755 $(DESTDIR)$(docdir)/images
+- install -d -m 755 $(DESTDIR)$(docdir)/images/icons
+- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto
+- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded
+- install -d -m 755 $(DESTDIR)$(docdir)/scripts
++ install -d -m 755 $(DESTDIR)$(htmldir)
++ install -d -m 755 $(DESTDIR)$(htmldir)/images
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded
++ install -d -m 755 $(DESTDIR)$(htmldir)/scripts
+ install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2
+- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir)
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/
+- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
+- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
++ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir)
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/
++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/
++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/
+ install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/
+
+ uninstall-local:
+- rm -f $(DESTDIR)$(docdir)/*.html
+- rm -f $(DESTDIR)$(docdir)/images/*.png
+- rm -f $(DESTDIR)$(docdir)/images/*.jpg
+- rm -f $(DESTDIR)$(docdir)/images/icons/*.png
+- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/*
+- rm -f $(DESTDIR)$(docdir)/scripts/*.css
+- rm -f $(DESTDIR)$(docdir)/scripts/*.js
++ rm -f $(DESTDIR)$(htmldir)/*.html
++ rm -f $(DESTDIR)$(htmldir)/images/*.png
++ rm -f $(DESTDIR)$(htmldir)/images/*.jpg
++ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png
++ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/*
++ rm -f $(DESTDIR)$(htmldir)/scripts/*.css
++ rm -f $(DESTDIR)$(htmldir)/scripts/*.js
+ rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2
+- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true
++ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true
diff --git a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
new file mode 100644
index 00000000000..ef336851c7b
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
@@ -0,0 +1,43 @@
+Fix gtk+ and jack automagic detection.
+
+https://github.com/calf-studio-gear/calf/issues/166
+
+--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200
++++ b/configure.ac 2019-03-10 19:22:05.578887471 +0100
+@@ -150,13 +150,35 @@
+ [set_enable_sse="no"])
+ AC_MSG_RESULT($set_enable_sse)
+
++AC_MSG_CHECKING([whether to enable GUI])
++AC_ARG_ENABLE(gui,
++ AS_HELP_STRING([--enable-gui],[enable graphical user interface]),
++ [set_enable_gui=$enableval],
++ [set_enable_gui=yes])
++AC_MSG_RESULT($set_enable_gui)
++
++AC_MSG_CHECKING([whether to enable JACK])
++AC_ARG_ENABLE(jack,
++ AS_HELP_STRING([--enable-jack],[enable support for JACK]),
++ [set_enable_jack=$enableval],
++ [set_enable_jack=yes])
++AC_MSG_RESULT($set_enable_jack)
++
+ ############################################################################################
+ # Compute status shell variables
+
+-if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
++if test "x$set_enable_gui" = "xno"; then
++ GUI_ENABLED="no (disabled by user choice)"
++fi
++
++if test "$JACK_FOUND" = "yes"; then
+ JACK_ENABLED="yes"
+ fi
+
++if test "x$set_enable_jack" = "xno"; then
++ JACK_ENABLED="no (disabled by user choice)"
++fi
++
+ if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then
+ LV2_GUI_ENABLED="yes"
+ fi
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2019-03-11 15:29 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-03-11 15:29 UTC (permalink / raw
To: gentoo-commits
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;
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2020-01-17 11:00 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-01-17 11:00 UTC (permalink / raw
To: gentoo-commits
commit: dde69d9c5fd1587f3745baef48c5b9a2f6793324
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 10:59:48 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 10:59:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde69d9c
media-plugins/calf: removed old (0.90.1)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/calf/Manifest | 1 -
media-plugins/calf/calf-0.90.1.ebuild | 77 ----------------------
.../calf/files/calf-0.90.1-fluidsynth-2.patch | 66 -------------------
3 files changed, 144 deletions(-)
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 4c531bb5b73..c691c2aa9cd 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,2 +1 @@
-DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
diff --git a/media-plugins/calf/calf-0.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
deleted file mode 100644
index 24614bd103c..00000000000
--- a/media-plugins/calf/calf-0.90.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-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 experimental gtk jack lash lv2 static-libs"
-
-REQUIRED_USE="jack? ( gtk )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- media-sound/fluidsynth:=
- gtk? (
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango
- )
- jack? ( virtual/jack )
- lash? ( media-sound/lash )
- lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-automagic.patch"
- "${FILESDIR}/${P}-htmldir.patch"
- "${FILESDIR}/${P}-desktop.patch"
- "${FILESDIR}/${P}-fluidsynth-2.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --prefix="${EPREFIX}"/usr
- --without-obsolete-check
- $(use_enable experimental)
- $(use_enable gtk gui)
- $(use_enable jack)
- $(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)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- mv "${ED}"/usr/share/bash-completion/completions/calf \
- "${ED}"/usr/share/bash-completion/completions/calfjackhost || die
-}
diff --git a/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch b/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
deleted file mode 100644
index 083b1e95d7d..00000000000
--- a/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bba03b6080dc198f3513b5c29fe1ba4ff9e4aa59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 10 Oct 2018 00:22:46 +0200
-Subject: [PATCH] fluidsynth: port to API for fluidsynth version > 2.0.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Build tested with fluidsynth 1.1.11 and 2.0.1
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/fluidsynth.cpp | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
-index c5d307d76..54023dc8b 100644
---- a/src/fluidsynth.cpp
-+++ b/src/fluidsynth.cpp
-@@ -74,6 +74,7 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
- new_sfid = sid;
-
- fluid_sfont_t* sfont = fluid_synth_get_sfont(s, 0);
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
- soundfont_name = (*sfont->get_name)(sfont);
-
- sfont->iteration_start(sfont);
-@@ -92,6 +93,26 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
- if (first_preset == -1)
- first_preset = id;
- }
-+#else
-+ soundfont_name = fluid_sfont_get_name(sfont);
-+
-+ fluid_sfont_iteration_start(sfont);
-+
-+ string preset_list;
-+ fluid_preset_t* tmp;
-+ int first_preset = -1;
-+ while((tmp = fluid_sfont_iteration_next(sfont)))
-+ {
-+ string pname = fluid_preset_get_name(tmp);
-+ int bank = fluid_preset_get_banknum(tmp);
-+ int num = fluid_preset_get_num(tmp);
-+ int id = num + 128 * bank;
-+ sf_preset_names[id] = pname;
-+ preset_list += calf_utils::i2s(id) + "\t" + pname + "\n";
-+ if (first_preset == -1)
-+ first_preset = id;
-+ }
-+#endif
- if (first_preset != -1)
- {
- fluid_synth_bank_select(s, 0, first_preset >> 7);
-@@ -134,7 +155,11 @@ void fluidsynth_audio_module::update_preset_num(int channel)
- {
- fluid_preset_t *p = fluid_synth_get_channel_preset(synth, channel);
- if (p)
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
- last_selected_presets[channel] = p->get_num(p) + 128 * p->get_banknum(p);
-+#else
-+ last_selected_presets[channel] = fluid_preset_get_num(p) + 128 * fluid_preset_get_banknum(p);
-+#endif
- else
- last_selected_presets[channel] = -1;
- status_serial++;
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2023-09-22 15:44 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-09-22 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 371ef91dcf5a57d241fa130c3c9bdf9b17768b31
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Sep 22 00:25:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 15:42:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371ef91d
media-plugins/calf: Backport clang fix
Upstream: https://github.com/calf-studio-gear/calf/commit/bfb857445e72230659493d3491970e3cb3c7eb9a
Closes: https://bugs.gentoo.org/831023
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/calf/calf-0.90.3-r2.ebuild | 1 +
...0.90.3-clang-lerp_table_lookup_float_mask.patch | 45 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/media-plugins/calf/calf-0.90.3-r2.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild
index 45506cd79a76..854f4789523c 100644
--- a/media-plugins/calf/calf-0.90.3-r2.ebuild
+++ b/media-plugins/calf/calf-0.90.3-r2.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.90.1-desktop.patch"
"${FILESDIR}/${PN}-0.90.3-fix-build-with-lld.patch"
"${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch"
+ "${FILESDIR}/${PN}-0.90.3-clang-lerp_table_lookup_float_mask.patch"
)
src_prepare() {
diff --git a/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch b/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch
new file mode 100644
index 000000000000..d868fb8e1f33
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch
@@ -0,0 +1,45 @@
+From bfb857445e72230659493d3491970e3cb3c7eb9a Mon Sep 17 00:00:00 2001
+From: Krzysztof Foltman <wdev@foltman.com>
+Date: Fri, 2 Aug 2019 20:55:50 +0100
+Subject: [PATCH] Compatibility: A possible fix for the clang++-8 issue.
+
+---
+ src/calf/fixed_point.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/calf/fixed_point.h b/src/calf/fixed_point.h
+index 7dbf5c9bc..63bfce167 100644
+--- a/src/calf/fixed_point.h
++++ b/src/calf/fixed_point.h
+@@ -215,7 +215,7 @@ template<class T, int FracBits> class fixed_point {
+ }
+
+ template<class U, int UseBits>
+- inline U lerp_table_lookup_int(U data[(1U<<IntBits)+1]) const {
++ inline U lerp_table_lookup_int(U *data) const {
+ unsigned int pos = uipart();
+ return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
+ }
+@@ -223,19 +223,19 @@ template<class T, int FracBits> class fixed_point {
+ /// Untested... I've started it to get a sin/cos readout for rotaryorgan, but decided to use table-less solution instead
+ /// Do not assume it works, because it most probably doesn't
+ template<class U, int UseBits>
+- inline U lerp_table_lookup_int_shift(U data[(1U<<IntBits)+1], unsigned int shift) {
++ inline U lerp_table_lookup_int_shift(U *data, unsigned int shift) {
+ unsigned int pos = (uipart() + shift) & ((1ULL << IntBits) - 1);
+ return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
+ }
+
+ template<class U>
+- inline U lerp_table_lookup_float(U data[(1U<<IntBits)+1]) const {
++ inline U lerp_table_lookup_float(U *data) const {
+ unsigned int pos = uipart();
+ return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();
+ }
+
+ template<class U>
+- inline U lerp_table_lookup_float_mask(U data[(1U<<IntBits)+1], unsigned int mask) const {
++ inline U lerp_table_lookup_float_mask(U *data, unsigned int mask) const {
+ unsigned int pos = ui64part() & mask;
+ // printf("full = %lld pos = %d + %f\n", value, pos, fpart_as_double());
+ return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2023-10-20 7:50 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2023-10-20 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 0b929107afb9ef2af56007fd0bf1383dd6bcb4e4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 07:50:32 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 07:50:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b929107
media-plugins/calf: updated live patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/calf/calf-9999.ebuild | 1 -
.../calf/files/calf-9999-fix-build-with-lld.patch | 27 ++++++----------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index f17d2973cb01..644ca320f2ee 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -47,7 +47,6 @@ PATCHES=(
"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
"${FILESDIR}/${PN}-0.90.1-desktop.patch"
"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
- "${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch"
)
src_prepare() {
diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
index 816da77f7d0d..acd196f6edd2 100644
--- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
+++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
@@ -1,26 +1,13 @@
-From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 21 Sep 2023 19:08:39 -0400
-Subject: [PATCH] Fix build with LLD
-
-LLVM's LLD handles the -retain-symbols-file option (used by
--export-symbols-regex in libtool) differently from GNU ld, causing
-undefined references during link. This commit removes the
--export-symbols-regex option from libcalf_la_LDFLAGS since by default
-libtool exports all symbols anyway, so it should not be necessary.
-
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6f11628b..0e775bef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
+@@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp
if USE_DEBUG
- libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
else
--libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
-+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+-libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
++libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
+ endif
endif
- if USE_LV2_GUI
---
-2.42.0
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2024-03-16 10:41 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2024-03-16 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 2f44b30451820673a836d46a9ddeb699989d0449
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 10:40:39 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 10:41:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f44b304
media-plugins/calf: eapi8 + updated desktop patch in live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/calf/calf-9999.ebuild | 6 +++---
media-plugins/calf/files/calf-9999-desktop.patch | 14 ++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 644ca320f2ee..dc7c686ac1e9 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools flag-o-matic toolchain-funcs xdg
@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
- "${FILESDIR}/${PN}-0.90.1-desktop.patch"
+ "${FILESDIR}/${PN}-9999-desktop.patch"
"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
)
diff --git a/media-plugins/calf/files/calf-9999-desktop.patch b/media-plugins/calf/files/calf-9999-desktop.patch
new file mode 100644
index 000000000000..486007e7e06f
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-desktop.patch
@@ -0,0 +1,14 @@
+--- a/calf.desktop.in
++++ b/calf.desktop.in
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Categories=Application;AudioVideo;Audio;GNOME
++Categories=AudioVideo;Audio;GNOME
+ Exec=calfjackhost
+ Icon=calf
+ Terminal=false
+ Type=Application
+-Version=@VERSION@
+
+ Name=Calf Plugin Pack for JACK
+ Name[fr]=Ensemble de greffons Calf pour JACK
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/
@ 2024-06-23 10:23 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2024-06-23 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 62143064d3847371b01634c75a8e4357a24d2236
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 10:22:56 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 10:23:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62143064
media-plugins/calf: updated live ebuild patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/calf/calf-9999.ebuild | 4 +-
.../calf/files/calf-9999-fix-build-with-lld.patch | 22 ++------
media-plugins/calf/files/calf-9999-htmldir.patch | 64 ++++++++++++++++++++++
.../calf/files/calf-9999-no-automagic.patch | 39 +++++++++++++
4 files changed, 109 insertions(+), 20 deletions(-)
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index dc7c686ac1e9..4c7268ed03a8 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -43,8 +43,8 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
- "${FILESDIR}/${PN}-0.90.1-htmldir.patch"
+ "${FILESDIR}/${PN}-9999-no-automagic.patch"
+ "${FILESDIR}/${PN}-9999-htmldir.patch"
"${FILESDIR}/${PN}-9999-desktop.patch"
"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
)
diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
index a33e8dc70503..563fde6589fc 100644
--- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
+++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
@@ -1,25 +1,11 @@
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 21 Sep 2023 19:08:39 -0400
-Subject: [PATCH] Fix build with LLD
-
-LLVM's LLD handles the -retain-symbols-file option (used by
--export-symbols-regex in libtool) differently from GNU ld, causing
-undefined references during link. This commit removes the
--export-symbols-regex option from libcalf_la_LDFLAGS since by default
-libtool exports all symbols anyway, so it should not be necessary.
-
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
-
-rebased
-
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp
if USE_DEBUG
- libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
+ libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static
else
--libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
- endif
+-libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static
++libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static
endif
+ if HAVE_LD_NODELETE
diff --git a/media-plugins/calf/files/calf-9999-htmldir.patch b/media-plugins/calf/files/calf-9999-htmldir.patch
new file mode 100644
index 000000000000..4b6c77d42f83
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-htmldir.patch
@@ -0,0 +1,64 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,29 +25,29 @@ clean-local:
+ rm -rf autom4te.cache
+
+ install-data-local:
+- install -d -m 755 $(DESTDIR)$(docdir)
+- install -d -m 755 $(DESTDIR)$(docdir)/images
+- install -d -m 755 $(DESTDIR)$(docdir)/images/icons
+- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto
+- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded
+- install -d -m 755 $(DESTDIR)$(docdir)/scripts
++ install -d -m 755 $(DESTDIR)$(htmldir)
++ install -d -m 755 $(DESTDIR)$(htmldir)/images
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto
++ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded
++ install -d -m 755 $(DESTDIR)$(htmldir)/scripts
+ install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2
+- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir)
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/
+- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/
+- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
+- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
++ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir)
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/
++ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/
++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/
++ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/
+ install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/
+
+ uninstall-local:
+- rm -f $(DESTDIR)$(docdir)/*.html
+- rm -f $(DESTDIR)$(docdir)/images/*.png
+- rm -f $(DESTDIR)$(docdir)/images/*.jpg
+- rm -f $(DESTDIR)$(docdir)/images/icons/*.png
+- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/*
+- rm -f $(DESTDIR)$(docdir)/scripts/*.css
+- rm -f $(DESTDIR)$(docdir)/scripts/*.js
++ rm -f $(DESTDIR)$(htmldir)/*.html
++ rm -f $(DESTDIR)$(htmldir)/images/*.png
++ rm -f $(DESTDIR)$(htmldir)/images/*.jpg
++ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png
++ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/*
++ rm -f $(DESTDIR)$(htmldir)/scripts/*.css
++ rm -f $(DESTDIR)$(htmldir)/scripts/*.js
+ rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2
+- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true
++ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true
+--- a/configure.ac
++++ b/configure.ac
+@@ -253,7 +253,7 @@ fi
+
+ # Other defines
+ AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
+-AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
++AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory])
+
+
+ ############################################################################################
diff --git a/media-plugins/calf/files/calf-9999-no-automagic.patch b/media-plugins/calf/files/calf-9999-no-automagic.patch
new file mode 100644
index 000000000000..87fa8a7a18e3
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-no-automagic.patch
@@ -0,0 +1,39 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -172,13 +172,35 @@ LDFLAGS="$save_LDFLAGS"
+
+ AM_CONDITIONAL(HAVE_LD_NODELETE, test "$linker_supports_nodelete" = "yes")
+
++AC_MSG_CHECKING([whether to enable GUI])
++AC_ARG_ENABLE(gui,
++ AS_HELP_STRING([--enable-gui],[enable graphical user interface]),
++ [set_enable_gui=$enableval],
++ [set_enable_gui=yes])
++AC_MSG_RESULT($set_enable_gui)
++
++AC_MSG_CHECKING([whether to enable JACK])
++AC_ARG_ENABLE(jack,
++ AS_HELP_STRING([--enable-jack],[enable support for JACK]),
++ [set_enable_jack=$enableval],
++ [set_enable_jack=yes])
++AC_MSG_RESULT($set_enable_jack)
++
+ ############################################################################################
+ # Compute status shell variables
+
+-if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
++if test "x$set_enable_gui" = "xno"; then
++ GUI_ENABLED="no (disabled by user choice)"
++fi
++
++if test "$JACK_FOUND" = "yes"; then
+ JACK_ENABLED="yes"
+ fi
+
++if test "x$set_enable_jack" = "xno"; then
++ JACK_ENABLED="no (disabled by user choice)"
++fi
++
+ if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then
+ LV2_GUI_ENABLED="yes"
+ fi
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-23 10:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 15:44 [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-23 10:23 Miroslav Šulc
2024-03-16 10:41 Miroslav Šulc
2023-10-20 7:50 Miroslav Šulc
2020-01-17 11:00 Miroslav Šulc
2019-03-11 15:29 Andreas Sturmlechner
2019-03-10 22:46 Andreas Sturmlechner
2016-09-18 13:29 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox