From: Jan Rękorajski Date: Sun, 30 Jan 2022 12:19:00 +0000 (+0100) Subject: - up to 4.0.0 X-Git-Tag: auto/th/muse-4.0.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=0dfb39a4ecc3b512acc16c2db23d623b8b112f8a;p=packages%2Fmuse.git - up to 4.0.0 --- diff --git a/fluidsynth2.patch b/fluidsynth2.patch deleted file mode 100644 index 4081a02..0000000 --- a/fluidsynth2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 6e352b874ddffc6185e499cda12c1731d14a3708 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 17 Oct 2018 23:17:31 +0200 -Subject: [PATCH] fluidsynth: Follow API change introduced in fluidsynth 2.0.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - muse3/synti/fluidsynth/fluidsynti.cpp | 44 ++++++++++++++++++++++++++- - 1 file changed, 43 insertions(+), 1 deletion(-) - -diff --git a/muse3/synti/fluidsynth/fluidsynti.cpp b/muse3/synti/fluidsynth/fluidsynti.cpp -index 11f51e57..75322d7e 100644 ---- a/muse3/synti/fluidsynth/fluidsynti.cpp -+++ b/muse3/synti/fluidsynth/fluidsynti.cpp -@@ -155,16 +155,22 @@ FluidSynth::~FluidSynth() - std::cerr << DEBUG_ARGS << "Error unloading soundfont!" << fluid_synth_error(fluidsynth) << std::endl; - } - -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - int err = delete_fluid_synth (fluidsynth); -+#else -+ delete_fluid_synth (fluidsynth); -+#endif - if(gui) - delete gui; - - if (initBuffer) - delete [] initBuffer; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - if (err == -1) { - std::cerr << DEBUG_ARGS << "error while destroying synth: " << fluid_synth_error(fluidsynth) << std::endl; - return; -- } -+ } -+#endif - } - - bool FluidSynth::init(const char* name) -@@ -1368,7 +1374,11 @@ const char* FluidSynth::getPatchName(int i, int, bool /*drum*/) const - else { - fluid_preset_t *preset = fluid_synth_get_channel_preset(fluidsynth, i); - if (!preset) return ""; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - return preset->get_name(preset); -+#else -+ return fluid_preset_get_name(preset); -+#endif - } - } - //--------------------------------------------------------- -@@ -1414,12 +1424,20 @@ const MidiPatch* FluidSynth::getFirstPatch (int channel) const - if (!channels[channel].drumchannel) { - for (unsigned bank = 0; bank < 128; ++bank) { - for (unsigned patch = 0; patch < 128; ++patch) { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - preset = sfont->get_preset (sfont, bank, patch); -+#else -+ preset = fluid_sfont_get_preset (sfont, bank, patch); -+#endif - if (preset) { - midiPatch.hbank = bank; - midiPatch.lbank = 0xff; // Off - midiPatch.prog = patch; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - midiPatch.name = preset->get_name (preset); -+#else -+ midiPatch.name = fluid_preset_get_name (preset); -+#endif - return &midiPatch; - } - } -@@ -1429,12 +1447,20 @@ const MidiPatch* FluidSynth::getFirstPatch (int channel) const - else { //This is a drumchannel - int bank = 128; - for (unsigned patch = 0; patch < 128; ++patch) { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - preset = sfont->get_preset (sfont, bank, patch); -+#else -+ preset = fluid_sfont_get_preset (sfont, bank, patch); -+#endif - if (preset) { - midiPatch.hbank = 0xff; // Off - midiPatch.lbank = 0xff; // Off - midiPatch.prog = patch; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - midiPatch.name = preset->get_name(preset); -+#else -+ midiPatch.name = fluid_preset_get_name (preset); -+#endif - return &midiPatch; - } - } -@@ -1466,13 +1492,21 @@ const MidiPatch* FluidSynth::getNextPatch (int channel, const MidiPatch* patch) - - for (unsigned bank = patch->hbank; bank < 128; ++bank) { - for ( ; prog < 128; ++prog) { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - preset = sfont->get_preset (sfont, bank, prog); -+#else -+ preset = fluid_sfont_get_preset (sfont, bank, prog); -+#endif - if (preset) { - //printf("Preset info: bank: %d prog: %d name: %s\n", bank, prog, preset->get_name(preset)); - midiPatch.hbank = bank; - midiPatch.lbank = 0xff; // Off - midiPatch.prog = prog; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - midiPatch.name = preset->get_name (preset); -+#else -+ midiPatch.name = fluid_preset_get_name (preset); -+#endif - return &midiPatch; - } - } -@@ -1483,13 +1517,21 @@ const MidiPatch* FluidSynth::getNextPatch (int channel, const MidiPatch* patch) - unsigned bank = 128; - unsigned prog = patch->prog; - for (prog = patch->prog + 1; prog < 128; ++prog) { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - preset = sfont->get_preset (sfont, bank, prog); -+#else -+ preset = fluid_sfont_get_preset (sfont, bank, prog); -+#endif - if (preset) { - //printf("Preset info: bank: %d prog: %d name: %s\n",bank, prog, preset->get_name(preset)); - midiPatch.hbank = 0xff; // Off - midiPatch.lbank = 0xff; // Off - midiPatch.prog = prog; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - midiPatch.name = preset->get_name (preset); -+#else -+ midiPatch.name = fluid_preset_get_name (preset); -+#endif - return &midiPatch; - } - } diff --git a/missing_includes.patch b/missing_includes.patch deleted file mode 100644 index 95c1e40..0000000 --- a/missing_includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -dur -x '*~' muse-3.0.2.orig/muse/widgets/genset.h muse-3.0.2/muse/widgets/genset.h ---- muse-3.0.2.orig/muse/widgets/genset.h 2017-12-04 22:01:19.000000000 +0100 -+++ muse-3.0.2/muse/widgets/genset.h 2018-11-22 19:13:29.182616803 +0100 -@@ -29,6 +29,7 @@ - #include "cobject.h" - #include "mdisettings.h" - -+#include - #include - #include - -diff -dur -x '*~' muse-3.0.2.orig/muse/widgets/pastedialog.h muse-3.0.2/muse/widgets/pastedialog.h ---- muse-3.0.2.orig/muse/widgets/pastedialog.h 2017-12-04 22:01:19.000000000 +0100 -+++ muse-3.0.2/muse/widgets/pastedialog.h 2018-11-22 19:13:48.033847674 +0100 -@@ -25,6 +25,7 @@ - - #include "ui_pastedialogbase.h" - #include -+#include - - namespace MusECore { - class Xml; -diff -dur -x '*~' muse-3.0.2.orig/synti/simpledrums2/simpledrumsgui.h muse-3.0.2/synti/simpledrums2/simpledrumsgui.h ---- muse-3.0.2.orig/synti/simpledrums2/simpledrumsgui.h 2018-01-29 21:07:03.000000000 +0100 -+++ muse-3.0.2/synti/simpledrums2/simpledrumsgui.h 2018-11-22 19:10:58.517743603 +0100 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - - #include "libsynti/gui.h" ---- muse-3.0.2.orig/muse/mplugins/mitplugin.cpp 2017-12-04 22:01:18.000000000 +0100 -+++ muse-3.0.2/muse/mplugins/mitplugin.cpp 2018-11-22 19:48:54.657286284 +0100 -@@ -35,6 +35,8 @@ - #include "rhythm.h" - #endif - -+#include -+ - namespace MusEGui { - - //--------------------------------------------------------- diff --git a/muse.desktop b/muse.desktop deleted file mode 100644 index 854c1f9..0000000 --- a/muse.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=MuSE -Comment=MuSE Audio/MIDI Sequnecer -Comment[pl]=Sekwencer Audio/MIDI MuSE -Exec=muse2 -Icon=muse -Terminal=false -Type=Application -Categories=Qt;Audio;Sequencer; -# vi: encoding=utf-8 diff --git a/muse.spec b/muse.spec index 7f8a0d8..024d4cc 100644 --- a/muse.spec +++ b/muse.spec @@ -2,25 +2,18 @@ # Conditional build: %bcond_without fluid # disable fluidsynth support -%ifnarch %{ix86} %{x8664} -%undefine with_fluid # fluidsynth support disabled for arch !ix86 !amd64 -%endif - %define qt_min_version 5.1.0 Summary: Linux Music Editor Summary(pl.UTF-8): Edytor muzyczny dla Linuksa Name: muse -Version: 3.0.2 +Version: 4.0.0 Release: 1 License: GPL v2 Group: X11/Applications/Sound -Source0: http://downloads.sourceforge.net/lmuse/%{name}-%{version}.tar.gz -# Source0-md5: 6e992f0f9d58adc3a2e2444dece37dfe -Source1: %{name}.desktop -Patch0: missing_includes.patch -Patch1: fluidsynth2.patch -URL: http://muse.seh.de/ +Source0: https://github.com/muse-sequencer/muse/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 2cb1904a93c9cc06abea9f01959d2de7 +URL: https://muse-sequencer.github.io/ BuildRequires: Qt5Core-devel >= %{qt_min_version} BuildRequires: Qt5Svg-devel >= %{qt_min_version} BuildRequires: Qt5UiTools-devel >= %{qt_min_version} @@ -71,12 +64,32 @@ Dokumentacja do anta. %prep %setup -q -%patch0 -p1 -%patch1 -p2 + +%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \ + src/utils/muse-find-unused-wavs \ + src/utils/muse-song-convert.py + +%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \ + src/share/scripts/ConstantLength \ + src/share/scripts/ConstantVelocityForNote \ + src/share/scripts/CreateBassline \ + src/share/scripts/DoNothing \ + src/share/scripts/Humanize \ + src/share/scripts/RandomPosition1 \ + src/share/scripts/RandomizeVelocityRelative \ + src/share/scripts/RemoveAftertouch \ + src/share/scripts/RemoveShortEvents \ + src/share/scripts/Rhythm1 \ + src/share/scripts/SpeedDouble \ + src/share/scripts/SpeedHalf \ + src/share/scripts/SwingQuantize1 \ + src/share/scripts/TempoDelay %build -install -d build -cd build +install -d src/build +cd src/build +export CFLAGS="%{rpmcflags} $(pkg-config --cflags atkmm-1.6)" +export CXXFLAGS="%{rpmcxxflags} $(pkg-config --cflags atkmm-1.6)" %cmake \ -DMusE_DOC_DIR="%{_docdir}/%{name}-%{version}" \ ../ @@ -85,16 +98,11 @@ cd build %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} -%{__make} -C build install \ - DESTDIR=$RPM_BUILD_ROOT \ -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -cp -p packaging/muse_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/muse.png +%{__make} -C src/build install \ + DESTDIR=$RPM_BUILD_ROOT \ -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/synthi/*.a -rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/COPYING +%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/COPYING %clean rm -rf $RPM_BUILD_ROOT @@ -110,9 +118,9 @@ rm -rf $RPM_BUILD_ROOT # do not use %doc, as it would remove files which are already there %{_docdir}/%{name}-%{version}/AUTHORS %{_docdir}/%{name}-%{version}/ChangeLog -%{_docdir}/%{name}-%{version}/NEWS %{_docdir}/%{name}-%{version}/README* %{_docdir}/%{name}-%{version}/SECURITY +%{_docdir}/muse-4.0.0/libdivide_LICENSE %dir %{_docdir}/%{name}-%{version}/deicsonze %{_docdir}/%{name}-%{version}/deicsonze/* %dir %{_docdir}/%{name}-%{version}/fluidsynth @@ -123,52 +131,56 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/%{name}-%{version}/simpledrums/* %dir %{_docdir}/%{name}-%{version}/vam %{_docdir}/%{name}-%{version}/vam/* -%attr(755,root,root) %{_bindir}/muse3 +%attr(755,root,root) %{_bindir}/muse4 +%attr(755,root,root) %{_bindir}/muse_plugin_scan %attr(755,root,root) %{_bindir}/grepmidi -%dir %{_libdir}/%{name}-3.0 -%dir %{_libdir}/%{name}-3.0/modules -%dir %{_libdir}/%{name}-3.0/plugins -%dir %{_libdir}/%{name}-3.0/synthi -%attr(755,root,root) %{_libdir}/%{name}-3.0/modules/*.so -%attr(755,root,root) %{_libdir}/%{name}-3.0/plugins/* -%attr(755,root,root) %{_libdir}/%{name}-3.0/synthi/* -%dir %{_datadir}/%{name}-3.0 -%dir %{_datadir}/%{name}-3.0/demos -%dir %{_datadir}/%{name}-3.0/drummaps -%dir %{_datadir}/%{name}-3.0/instruments -%dir %{_datadir}/%{name}-3.0/locale -%dir %{_datadir}/%{name}-3.0/metronome -%dir %{_datadir}/%{name}-3.0/plugins -%dir %{_datadir}/%{name}-3.0/presets -%dir %{_datadir}/%{name}-3.0/pybridge -%dir %{_datadir}/%{name}-3.0/scoreglyphs -%dir %{_datadir}/%{name}-3.0/scripts -%dir %{_datadir}/%{name}-3.0/templates -%dir %{_datadir}/%{name}-3.0/themes -%dir %{_datadir}/%{name}-3.0/utils -%dir %{_datadir}/%{name}-3.0/wallpapers +%dir %{_libdir}/%{name}-4.0 +%dir %{_libdir}/%{name}-4.0/converters +%dir %{_libdir}/%{name}-4.0/modules +%dir %{_libdir}/%{name}-4.0/plugins +%dir %{_libdir}/%{name}-4.0/synthi +%attr(755,root,root) %{_libdir}/%{name}-4.0/converters/*.so +%attr(755,root,root) %{_libdir}/%{name}-4.0/modules/*.so +%attr(755,root,root) %{_libdir}/%{name}-4.0/plugins/* +%attr(755,root,root) %{_libdir}/%{name}-4.0/synthi/* +%dir %{_datadir}/%{name}-4.0 +%dir %{_datadir}/%{name}-4.0/demos +%dir %{_datadir}/%{name}-4.0/drummaps +%dir %{_datadir}/%{name}-4.0/instruments +%dir %{_datadir}/%{name}-4.0/locale +%dir %{_datadir}/%{name}-4.0/metronome +%dir %{_datadir}/%{name}-4.0/plugins +%dir %{_datadir}/%{name}-4.0/presets +%dir %{_datadir}/%{name}-4.0/pybridge +%dir %{_datadir}/%{name}-4.0/rdf +%dir %{_datadir}/%{name}-4.0/scoreglyphs +%dir %{_datadir}/%{name}-4.0/scripts +%dir %{_datadir}/%{name}-4.0/templates +%dir %{_datadir}/%{name}-4.0/themes +%dir %{_datadir}/%{name}-4.0/utils +%dir %{_datadir}/%{name}-4.0/wallpapers %{_datadir}/mime/packages/muse.xml -%{_datadir}/%{name}-3.0/didyouknow.txt -%{_datadir}/%{name}-3.0/splash.png -%{_datadir}/%{name}-3.0/demos/* -%{_datadir}/%{name}-3.0/drummaps/* -%{_datadir}/%{name}-3.0/instruments/* -%{_datadir}/%{name}-3.0/locale/* -%{_datadir}/%{name}-3.0/metronome/* -%{_datadir}/%{name}-3.0/plugins/* -%{_datadir}/%{name}-3.0/presets/* -%{_datadir}/%{name}-3.0/pybridge/* -%{_datadir}/%{name}-3.0/scoreglyphs/* -%{_datadir}/%{name}-3.0/scripts/* -%{_datadir}/%{name}-3.0/templates/* -%{_datadir}/%{name}-3.0/themes/* -%{_datadir}/%{name}-3.0/utils/* -%{_datadir}/%{name}-3.0/wallpapers/* -%{_desktopdir}/muse.desktop -%{_pixmapsdir}/muse.png +%{_datadir}/%{name}-4.0/splash.jpg +%{_datadir}/%{name}-4.0/didyouknow.txt +%{_datadir}/%{name}-4.0/demos/* +%{_datadir}/%{name}-4.0/drummaps/* +%{_datadir}/%{name}-4.0/instruments/* +%{_datadir}/%{name}-4.0/locale/* +%{_datadir}/%{name}-4.0/metronome/* +%{_datadir}/%{name}-4.0/plugins/* +%{_datadir}/%{name}-4.0/presets/* +%{_datadir}/%{name}-4.0/pybridge/* +%{_datadir}/%{name}-4.0/rdf/* +%{_datadir}/%{name}-4.0/scoreglyphs/* +%{_datadir}/%{name}-4.0/scripts/* +%{_datadir}/%{name}-4.0/templates/* +%{_datadir}/%{name}-4.0/themes/* +%{_datadir}/%{name}-4.0/utils/* +%{_datadir}/%{name}-4.0/wallpapers/* +%{_desktopdir}/org.musesequencer.Muse4.desktop %{_mandir}/man1/* -%{_iconsdir}/hicolor/64x64/apps/muse_icon.png -%{_datadir}/metainfo/muse.appdata.xml +%{_iconsdir}/hicolor/*x*/apps/muse.png +%{_datadir}/metainfo/org.musesequencer.Muse4.appdata.xml %files doc %defattr(644,root,root,755) @@ -186,5 +198,3 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/%{name}-%{version}/muse_html/single/developer_docs/* %{_docdir}/%{name}-%{version}/muse_html/split/documentation/* %{_docdir}/%{name}-%{version}/muse_html/split/developer_docs/* - -