[gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ada017ed321da4cd5e350bd01535fb3e93b54818
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:21:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 15:01:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada017ed

media-sound/yoshimi: Drop 1.7.1-r1

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

 media-sound/yoshimi/Manifest                       |  1 -
 .../files/yoshimi-1.7.1-fix-LV2_Descriptor.patch   | 47 -------------------
 media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild        | 53 ----------------------
 3 files changed, 101 deletions(-)

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 79022d2a18c..8299e872d6b 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,2 +1 @@
-DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
 DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9

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
deleted file mode 100644
index 94e225e4f48..00000000000
--- a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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-r1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
deleted file mode 100644
index 4c2573a12e3..00000000000
--- a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-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}"
-
-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
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}