gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-plugins/calf
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
9 files changed, 254 insertions, 213 deletions
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 74f641a22ce9..b93231cbfcd0 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,8 +1,9 @@
-AUX calf-0.0.60-cpp14.patch 3259 BLAKE2B 1a76d9170088bc6adf466c06d026f7e9adc11c36b8d8af35894a7f18eae4d428414f77024ab9849cdb0a465afb4803c3c1b3e2dc53eac76f5e24326fadc60adb SHA512 6f71feced0d2cb3799a337cf5dd32ee43e8d5f412ea144a6e65c293d0d7c7898f800b375757422adc15b42576b6a4c817fdb07bf1ccf59ce658754b702c58243
-DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
+AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba
+AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48
+AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f
 DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
-EBUILD calf-0.0.60-r1.ebuild 1114 BLAKE2B f1e5f69121e7bb9c8c32a7fbd425b0d54884f4ab7bf99a51e705490a008426833470404866fba6d62fb5b60d5f5fdd4492ff6c8cceb9ebc3005c1332303cc867 SHA512 5dc27ad36ca4677882cfde392e8b89a09d7cb86ea8f804f4259ef8802f174612cd011f6644e14d2e5d15269e8a276d627ff37b803d8409d64dbbfdca7f6aac58
-EBUILD calf-0.90.0-r2.ebuild 1382 BLAKE2B 2080b6a17d503c43dac7a2ec2f60ed32eacbf32afcba5bc0d3308feab3e52e02c4fb21038ac022657ec923c1fe1eaa4caff8e449fa0ca103808ff199ff506175 SHA512 5100e445ee378800b36d51c8d01a3d9ec5e43ce2f27a73a851d7c81bb1163d763f1566fe0589ff42145816b9acbc637d1c53eef6455480e35620be55b3acf2c1
+DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
 EBUILD calf-0.90.0.ebuild 1240 BLAKE2B d25d5384de1227348e8df740323e0ea462b7ea6af9fc4810b82f3ddad1f4244f1d60719290155aa97e694d903cfcdd112766cd0d340161f74578580fa40b0004 SHA512 bfc4c1580ed472d483e42804f2404f02d56f6cc9159c36e10b69570670d1bcb3a525dd348fb4e4aa08f9d6dba1a50ab93d6668fe2c7159ff481b6cbced81cf68
-EBUILD calf-9999.ebuild 1382 BLAKE2B 2080b6a17d503c43dac7a2ec2f60ed32eacbf32afcba5bc0d3308feab3e52e02c4fb21038ac022657ec923c1fe1eaa4caff8e449fa0ca103808ff199ff506175 SHA512 5100e445ee378800b36d51c8d01a3d9ec5e43ce2f27a73a851d7c81bb1163d763f1566fe0589ff42145816b9acbc637d1c53eef6455480e35620be55b3acf2c1
+EBUILD calf-0.90.1.ebuild 1611 BLAKE2B b7f3c7446b226acb9340b8ec187e9d55af2ef9aa05b900954acd9fd25ceef416a4b21c8ca8429c8d22e9c7c0169a71f57cb5c8b1bb092515bd307581202ba721 SHA512 cbafd242e10a3641c9790827e293642714011b1a758a7eb2aefc597e6eca655def4ecfd6c38c719b94e07f75bf2b4fc29cb6b7d64c1c67d230d7dccf4f28a750
+EBUILD calf-9999.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
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 993a346da869..000000000000
--- 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 f39ee8bb02a9..000000000000
--- 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/calf-0.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
new file mode 100644
index 000000000000..7d6a75335773
--- /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/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index f39ee8bb02a9..e8aaa6330d72 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools gnome2-utils
+EAPI=7
+
+inherit autotools xdg
 
 DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="http://calf-studio-gear.org/"
@@ -17,23 +18,35 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
+IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs"
+
+REQUIRED_USE="jack? ( gtk )"
 
-RDEPEND="dev-libs/atk
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
-	media-sound/fluidsynth
-	jack? ( virtual/jack )
+	media-sound/fluidsynth:=
 	gtk? (
 		x11-libs/cairo
-		x11-libs/gtk+:2
 		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
 		x11-libs/pango
 	)
+	jack? ( virtual/jack )
 	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	lv2? ( media-libs/lv2 )
+"
+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"
+)
 
 src_prepare() {
 	default
@@ -41,24 +54,23 @@ src_prepare() {
 }
 
 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) \
+	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[@]}"
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+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.0.60-cpp14.patch b/media-plugins/calf/files/calf-0.0.60-cpp14.patch
deleted file mode 100644
index a04043c8abca..000000000000
--- 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;
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 000000000000..93fc125e0110
--- /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 000000000000..83481b112885
--- /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 000000000000..ef336851c7b3
--- /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
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /media-plugins/calf
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)