summaryrefslogtreecommitdiff
path: root/kde-apps/minuet
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/minuet')
-rw-r--r--kde-apps/minuet/Manifest3
-rw-r--r--kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch94
-rw-r--r--kde-apps/minuet/minuet-19.08.3-r1.ebuild33
-rw-r--r--kde-apps/minuet/minuet-19.12.1-r1.ebuild34
4 files changed, 164 insertions, 0 deletions
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index de3e49680597..86db0f1ff341 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,8 @@
+AUX minuet-19.08.3-fluidsynth-2.patch 3582 BLAKE2B b9ec13c676c9b8c1dd922d12179dba5bda5c1e7badc7e58d2fad38287ae3e5a75ab7b13eac6137beddad1cfbc16b3085d29f456390ec61cb3eca7b7ac76d44ff SHA512 c0bd1bf3e59e3fcc60111a91b9cf78d554dd0d94d43d71a86c7ec76f2fb4ad202f6bd94da7092a058693ba13f4ce6c9e39c47a63a2562f0a2fe15f67f9439e64
DIST minuet-19.08.3.tar.xz 27593424 BLAKE2B f0aad2bbb9f4e0f0fbe8e9c493876eb482379610fd173f754aea8cdec06ba3baf5944aa9237dc71e12c0e7e4536e770b4f7fa14740be551e91e41b1a7ee9b733 SHA512 0e21f9f7ef97130f217842ecc430ee3742ab9fb1d86d4b24d11d4b8c42ce77516f0c1c258ebfe731296f7b08a699734daafb25c6a2bb1ae42a32b2e2b414be96
DIST minuet-19.12.1.tar.xz 27588988 BLAKE2B fc6a64fc41299ceaf25cefb854a1688916771769a1ac68d1c5991cbfbf48db27d51ed6b22efd3ed9e4421ca22861dced7c6c66d83d2907930863c6a89f14f40d SHA512 a5e5b7ea26f8dc3b20c0bb4ce9015fb704f30ad6221c6729ad8bf11cb68b09e4cfb53a541f7786916ce6ea37806d24d73882ea39158cac9d5eee6832fbf42090
+EBUILD minuet-19.08.3-r1.ebuild 726 BLAKE2B cb110c5c60015553d435c0025df76ef3ff38a4ab161caf4416e8a234636f1059a1e6f0696dc721f40cb9c7449efbbd775849d87d52c8b300bc231c490dd018d2 SHA512 40a22a26fd236b90f87b4d1928cee30144d148184be25706c433821f2a5933aeb5244549e832d1ec9bc0ed1fa0857816acf0bb8b0328585e3f93bc39d5d48094
EBUILD minuet-19.08.3.ebuild 672 BLAKE2B e20170d977b5255d420f5cd5bf35b8f7a94c061a39d401ff15669b3e3f3f201945592e5431b25289af1ee052204c7fa94f738a5fc5a7b71d2377899a41f6db09 SHA512 42df34239cb680769dcc2867a70e11376722db41ad997a168bc18863c91cbd72f095fee7d853e3d33a613449180c2aaf0e9e643d96341fe5341b9514236c5b22
+EBUILD minuet-19.12.1-r1.ebuild 736 BLAKE2B f70b8768130466b9cb9673474be06f618b8ff566c0593365fdc16b72da7d6656ff8edaa2e41111bff9b7f8cd9581939061f85159a05c78d24f036e45ef4b8dcf SHA512 79d3d010c77d9fe8f67052aa58e9fea2c6810ad984c2edae3da073d5a7ab6e93c89244e8e86f7ae1e11b3962aa9e265f50a83ccacfaffe977a7ea2eae4661afc
EBUILD minuet-19.12.1.ebuild 676 BLAKE2B 1d8ee15664baf503179c3e772ccd00c72eaf6d4c30614335e596a03e6e7e41f7d083c3ba23c805e5c4ceb1de38a0d4e6e8dca7e906e95f3815f71ac2ccde8898 SHA512 44839e6e8475c913084cde3ef7e73b1ae99f6c0069ed3ad46b28f0bbd87467129d2d5d531c2500c1c172ef23776509bebfad6ab9c42393dfa2ef848adbfa8278
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch b/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch
new file mode 100644
index 000000000000..9bb3c5bad1b9
--- /dev/null
+++ b/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch
@@ -0,0 +1,94 @@
+From d707ab85c60d68e0310559df4608d86680cc811a Mon Sep 17 00:00:00 2001
+From: Tom Moebert <tom.mbrt@googlemail.com>
+Date: Sat, 18 Jan 2020 00:26:30 +0100
+Subject: Port to fluidsynth 2.0.0 API
+
+Summary:
+This includes necessary adaptations for fluidsynth 2.0. All changes are backward-compatible to fluidsynth 1.1. For details, see:
+
+http://www.fluidsynth.org/api/index.html#NewIn2_0_0
+
+Reviewers: #minuet
+
+Subscribers: asturmlechner, aacid, kde-edu
+
+Tags: #minuet, #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D26558
+---
+ .../fluidsynthsoundcontroller.cpp | 22 ++++++++++++++++++----
+ .../fluidsynthsoundcontroller.h | 1 +
+ 2 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
+index 67e6826..7252914 100644
+--- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
++++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
+@@ -34,13 +34,14 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent)
+ : Minuet::ISoundController(parent),
+ m_audioDriver(0),
+ m_sequencer(0),
+- m_song(0)
++ m_song(0),
++ m_unregisteringEvent(0)
+ {
+ m_tempo = 60;
+
+ m_settings = new_fluid_settings();
+- fluid_settings_setstr(m_settings, "synth.reverb.active", "no");
+- fluid_settings_setstr(m_settings, "synth.chorus.active", "no");
++ fluid_settings_setint(m_settings, "synth.reverb.active", 0);
++ fluid_settings_setint(m_settings, "synth.chorus.active", 0);
+
+ m_synth = new_fluid_synth(m_settings);
+
+@@ -55,6 +56,9 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent)
+ if (fluid_res == FLUID_FAILED)
+ qCritical() << "Error when loading soundfont!";
+
++ m_unregisteringEvent = new_fluid_event();
++ fluid_event_set_source(m_unregisteringEvent, -1);
++
+ resetEngine();
+ }
+
+@@ -63,6 +67,7 @@ FluidSynthSoundController::~FluidSynthSoundController()
+ deleteEngine();
+ if (m_synth) delete_fluid_synth(m_synth);
+ if (m_settings) delete_fluid_settings(m_settings);
++ if (m_unregisteringEvent) delete_fluid_event(m_unregisteringEvent);
+ }
+
+ void FluidSynthSoundController::setPitch(qint8 pitch)
+@@ -240,7 +245,16 @@ void FluidSynthSoundController::resetEngine()
+
+ void FluidSynthSoundController::deleteEngine()
+ {
+- if (m_sequencer) delete_fluid_sequencer(m_sequencer);
++ if (m_sequencer) {
++#if FLUIDSYNTH_VERSION_MAJOR >= 2
++ // explicit client unregistering required
++ fluid_sequencer_unregister_client(m_sequencer, m_callbackSeqID);
++ fluid_event_set_dest(m_unregisteringEvent, m_synthSeqID);
++ fluid_event_unregistering(m_unregisteringEvent);
++ fluid_sequencer_send_now(m_sequencer, m_unregisteringEvent);
++#endif
++ delete_fluid_sequencer(m_sequencer);
++ }
+ if (m_audioDriver) delete_fluid_audio_driver(m_audioDriver);
+ }
+
+diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
+index afad46b..ed111c2 100644
+--- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
++++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
+@@ -63,6 +63,7 @@ private:
+ fluid_audio_driver_t *m_audioDriver;
+ fluid_sequencer_t *m_sequencer;
+ fluid_synth_t *m_synth;
++ fluid_event_t *m_unregisteringEvent;
+
+ short m_synthSeqID;
+ short m_callbackSeqID;
+--
+cgit v1.1
diff --git a/kde-apps/minuet/minuet-19.08.3-r1.ebuild b/kde-apps/minuet/minuet-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..85d2f878f171
--- /dev/null
+++ b/kde-apps/minuet/minuet-19.08.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Music Education software by KDE"
+HOMEPAGE="https://minuet.kde.org/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ media-sound/fluidsynth:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fluidsynth-2.patch" )
diff --git a/kde-apps/minuet/minuet-19.12.1-r1.ebuild b/kde-apps/minuet/minuet-19.12.1-r1.ebuild
new file mode 100644
index 000000000000..98fa208cc5cc
--- /dev/null
+++ b/kde-apps/minuet/minuet-19.12.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Music Education software by KDE"
+HOMEPAGE="https://minuet.kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ media-sound/fluidsynth:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-19.08.3-fluidsynth-2.patch" )
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 23:38:32 +0000