gentoo resync : 25.08.2020

4 files changed, 103 insertions, 1 deletions

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 617f01ed91da..0faf61f0cc04 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,6 @@
+AUX yoshimi-1.7.1-fix-LV2_Descriptor.patch 3062 BLAKE2B 4c69d385c2b5e7b90e79b6e19bf6c41ee6fbe4219e3b96d1cd53cc4a760e0bc21379fc6c753c24c63c825463f5fefe9f94aadcb69be7dc3935b4a8b42601d8b8 SHA512 0a57f3a4e68e74569d4a8d9182a5d3692ca16f46e4c3dba126c8e49b4579c759554d451d7526ca1245a9e5947d4b37b9a1b12a78e322472f6c97e4dc985010ae
 DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
-EBUILD yoshimi-1.7.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
+DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
+EBUILD yoshimi-1.7.1-r1.ebuild 1094 BLAKE2B 3ea86703750ade54eb4449a4a93afd589b366f58122649899d2f2b020e9ed8eaeb2925dec7da3f5efe354503475c805185fcb3bb1192f1f2836397ccea9e55d6 SHA512 8153ec253ded0aac30a759781e5ba6d3150213fdb8ac96a2b630179bcc67da0267a560c438250814e9194c30af851b5b46dfab4743752c4b64b9381b2cc72493
+EBUILD yoshimi-1.7.2.ebuild 1011 BLAKE2B b28c7c74baa9813d5cb76a114f259b758882a6100856c9bbdf3dd212cef46c927a9e9a9ffd41f6c84ca37bc0352aa1cbfe52db179b193b4c700df716e2d542bc SHA512 63906d2c45c61560fa04c1db3be7d7566fac17bb610f1b7906921b27e73a03401b0742a55f95bdfad4f34d60c080453eb5d648bc993c8c833c483be992c4ec73
 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
new file mode 100644
index 000000000000..94e225e4f48f
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
@@ -0,0 +1,47 @@
+diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
+index 3502689..9be6128 100644
+--- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
++++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
+@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
+ }
+ 
+ 
+-LV2_Handle	YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
++LV2_Handle	YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
+ {
+     SynthEngine *synth = new SynthEngine(0, NULL, true);
+     if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
+@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
+ }
+ 
+ 
+-LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
++LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
+ {
+-    const _LV2UI_Descriptor *desc = descriptor;
++    const LV2UI_Descriptor *desc = descriptor;
+     descriptor = desc;
+     const char *plug = plugin_uri;
+     plugin_uri = plug;
+diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
+index a484a8b..47f4729 100644
+--- a/src/LV2_Plugin/YoshimiLV2Plugin.h
++++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
+@@ -106,7 +106,7 @@ public:
+    virtual void registerAudioPort(int) {}
+ 
+    //static methods
+-   static LV2_Handle	instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
++   static LV2_Handle	instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
+    static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
+    static void activate(LV2_Handle instance);
+    static void deactivate(LV2_Handle instance);
+@@ -159,7 +159,7 @@ public:
+     YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
+     ~YoshimiLV2PluginUI();
+     bool init();
+-    static LV2UI_Handle	instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
++    static LV2UI_Handle	instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
+     static void cleanup(LV2UI_Handle ui);
+     static void static_guiClosed(void *arg);
+     void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
index d9faf9344bfe..4c2573a12e31 100644
--- a/media-sound/yoshimi/yoshimi-1.7.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
@@ -35,6 +35,8 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/src"
 
 DOCS=( Changelog README.txt )
 
+PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 	append-cxxflags -lpthread
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
new file mode 100644
index 000000000000..bb04f4a15df6
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-libs/mxml-2.5
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}