Skip to content

Commit

Permalink
audio/muse-sequencer: Update 4.0.0 -> 4.1.0
Browse files Browse the repository at this point in the history
PR:		265452
Submitted by:	Florian Walpen <dev@submerge.ch> (original version)
  • Loading branch information
yurivict committed Jul 26, 2022
1 parent bc11d4f commit d4f8363
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 72 deletions.
24 changes: 13 additions & 11 deletions audio/muse-sequencer/Makefile
@@ -1,6 +1,5 @@
PORTNAME= muse-sequencer
DISTVERSION= 4.0.0
PORTREVISION= 3
DISTVERSION= 4.1.0
CATEGORIES= audio

MAINTAINER= yuri@FreeBSD.org
Expand All @@ -11,7 +10,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \
lv2>0:audio/lv2
LIB_DEPENDS= libinstpatch-1.0.so:audio/libinstpatch libjack.so:audio/jack \
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
libinstpatch-1.0.so:audio/libinstpatch \
libjack.so:audio/jack \
liblash.so:audio/lash \
liblilv-0.so:audio/lilv \
liblo.so:audio/liblo \
Expand All @@ -23,22 +24,23 @@ LIB_DEPENDS= libinstpatch-1.0.so:audio/libinstpatch libjack.so:audio/jack \
libsord-0.so:devel/sord \
libsratom-0.so:audio/sratom

USES= cmake compiler:c++11-lib desktop-file-utils gnome localbase:ldflags qt:5 pkgconfig python shared-mime-info shebangfix
USE_GITHUB= yes
GH_ACCOUNT= muse-sequencer
GH_PROJECT= muse
GH_TAGNAME= 4.0.0
SHEBANG_FILES= share/scripts/* utils/muse-find-unused-wavs utils/muse-song-convert.py
USES= cmake compiler:c++11-lib desktop-file-utils gl gnome localbase:ldflags qt:5 pkgconfig python shared-mime-info shebangfix
USE_GL= gl
USE_QT= core gui svg xml widgets buildtools_build linguisttools_build qmake_build uitools_build
USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libsigc++20 pango pangomm
USE_LDCONFIG= yes

USE_GITHUB= yes
GH_PROJECT= muse

SHEBANG_FILES= share/scripts/* utils/muse-find-unused-wavs utils/muse-song-convert.py

CMAKE_OFF= ENABLE_ALSA ENABLE_DSSI

WRKSRC_SUBDIR= src

DATADIR= ${PREFIX}/share/muse-4.0
DOCSDIR= ${PREFIX}/share/doc/muse-4.0
DATADIR= ${PREFIX}/share/muse-${DISTVERSION:R}
DOCSDIR= ${PREFIX}/share/doc/muse-${DISTVERSION:R}

OPTIONS_DEFINE= FLUIDSYNTH DOCS
OPTIONS_DEFAULT= FLUIDSYNTH
Expand Down
6 changes: 3 additions & 3 deletions audio/muse-sequencer/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1624792215
SHA256 (muse-sequencer-muse-4.0.0_GH0.tar.gz) = cdd4c76a19f5be2d72832f6ed0d22218647c58b33f2da45ab2223a4c04bddf96
SIZE (muse-sequencer-muse-4.0.0_GH0.tar.gz) = 12265273
TIMESTAMP = 1657317357
SHA256 (muse-sequencer-muse-4.1.0_GH0.tar.gz) = b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
SIZE (muse-sequencer-muse-4.1.0_GH0.tar.gz) = 12323398
25 changes: 25 additions & 0 deletions audio/muse-sequencer/files/patch-CMakeLists.txt
@@ -0,0 +1,25 @@
--- CMakeLists.txt.orig 2022-07-12 10:34:16 UTC
+++ CMakeLists.txt
@@ -708,14 +708,14 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
INCLUDE(CPack)
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

-set(CMAKE_CXX_FLAGS "-Werror=format-security -Wextra -Winvalid-pch -fexceptions -Wall -fPIC" CACHE STRING "Default CXX flags" FORCE)
-# set(CMAKE_CXX_FLAGS "-Werror=format-security -Wextra -Winvalid-pch -fexceptions -Wall -fPIC ${CMAKE_CXX_FLAGS}" CACHE STRING "Default CXX flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC" CACHE STRING "Release CXX flags" FORCE)
-# set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "Release CXX flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC" CACHE STRING "Release w/deb info CXX flags" FORCE)
-# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "Release w/deb info CXX flags" FORCE)
-set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DQT_DEBUG -Werror -Wall -Wextra -fPIC" CACHE STRING "Debug CXX flags" FORCE)
-# set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DQT_DEBUG -Werror -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "Debug CXX flags" FORCE)
+# set(CMAKE_CXX_FLAGS "-Werror=format-security -Wextra -Winvalid-pch -fexceptions -Wall -fPIC" CACHE STRING "Default CXX flags" FORCE)
+set(CMAKE_CXX_FLAGS "-Werror=format-security -Wextra -Winvalid-pch -fexceptions -Wall -fPIC ${CMAKE_CXX_FLAGS}" CACHE STRING "Default CXX flags" FORCE)
+# set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC" CACHE STRING "Release CXX flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "Release CXX flags" FORCE)
+# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC" CACHE STRING "Release w/deb info CXX flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -fomit-frame-pointer -ffast-math -fno-finite-math-only -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "Release w/deb info CXX flags" FORCE)
+# set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DQT_DEBUG -Werror -Wall -Wextra -fPIC" CACHE STRING "Debug CXX flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DQT_DEBUG -Werror -Wall -Wextra -fPIC ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "Debug CXX flags" FORCE)

# NOTE: share/ directory needs to be at the end so that the translations
# are scanned before coming to share/locale
20 changes: 20 additions & 0 deletions audio/muse-sequencer/files/patch-muse_app.cpp
@@ -0,0 +1,20 @@
--- muse/app.cpp.orig 2022-07-09 17:10:01 UTC
+++ muse/app.cpp
@@ -49,6 +49,7 @@
#include <iostream>
#include <algorithm>
//#include <typeinfo>
+#include <random>

#include "app.h"
#include "master/lmaster.h"
@@ -2743,7 +2744,8 @@ void MusE::showDidYouKnowDialog()
didYouKnow.tipList.append(tipMessage);
}

- std::random_shuffle(didYouKnow.tipList.begin(),didYouKnow.tipList.end());
+ std::random_device randomDevice;
+ std::shuffle(didYouKnow.tipList.begin(),didYouKnow.tipList.end(), randomDevice);

didYouKnow.show();
if( didYouKnow.exec()) {
118 changes: 60 additions & 58 deletions audio/muse-sequencer/pkg-plist
@@ -1,67 +1,67 @@
bin/grepmidi
bin/muse4
bin/muse_plugin_scan
lib/muse-4.0/converters/rubberband_converter.so
lib/muse-4.0/converters/src_converter.so
lib/muse-4.0/converters/zita_resampler_converter.so
lib/muse-4.0/modules/libaudio_converter_plugin.so
lib/muse-4.0/modules/libmuse_al.so
lib/muse-4.0/modules/libmuse_arranger.so
lib/muse-4.0/modules/libmuse_audio_convert.so
lib/muse-4.0/modules/libmuse_awl.so
lib/muse-4.0/modules/libmuse_cliplist.so
lib/muse-4.0/modules/libmuse_components.so
lib/muse-4.0/modules/libmuse_core.so
lib/muse-4.0/modules/libmuse_ctrl.so
lib/muse-4.0/modules/libmuse_driver.so
lib/muse-4.0/modules/libmuse_evdata_module.so
lib/muse-4.0/modules/libmuse_icons.so
lib/muse-4.0/modules/libmuse_instruments.so
lib/muse-4.0/modules/libmuse_latency_compensator_module.so
lib/muse-4.0/modules/libmuse_liste.so
lib/muse-4.0/modules/libmuse_lv2_gtk2_support.so
lib/muse-4.0/modules/libmuse_lv2host_module.so
lib/muse-4.0/modules/libmuse_marker.so
lib/muse-4.0/modules/libmuse_master.so
lib/muse-4.0/modules/libmuse_memory_module.so
lib/muse-4.0/modules/libmuse_midi_controller_module.so
lib/muse-4.0/modules/libmuse_midiedit.so
lib/muse-4.0/modules/libmuse_midnam_module.so
lib/muse-4.0/modules/libmuse_mixer.so
lib/muse-4.0/modules/libmuse_mpevent_module.so
lib/muse-4.0/modules/libmuse_mplugins.so
lib/muse-4.0/modules/libmuse_plugin_cache_reader_module.so
lib/muse-4.0/modules/libmuse_plugin_cache_writer_module.so
lib/muse-4.0/modules/libmuse_plugin_list_module.so
lib/muse-4.0/modules/libmuse_plugin_rdf_module.so
lib/muse-4.0/modules/libmuse_plugin_scan_module.so
lib/muse-4.0/modules/libmuse_remote.so
lib/muse-4.0/modules/libmuse_simpler_plugin.so
lib/muse-4.0/modules/libmuse_simpler_plugingui.so
lib/muse-4.0/modules/libmuse_string.so
lib/muse-4.0/modules/libmuse_synti.so
lib/muse-4.0/modules/libmuse_sysex_helper_module.so
lib/muse-4.0/modules/libmuse_time_stretch_module.so
lib/muse-4.0/modules/libmuse_wave_module.so
lib/muse-4.0/modules/libmuse_waveedit.so
lib/muse-4.0/modules/libmuse_wavepreview_module.so
lib/muse-4.0/modules/libmuse_widgets.so
lib/muse-4.0/modules/libmuse_widgets_functiondialogs.so
lib/muse-4.0/modules/libmuse_xml_module.so
lib/muse-4.0/plugins/doublechorus.so
lib/muse-4.0/plugins/freeverb.so
lib/muse-4.0/plugins/pandelay.so
lib/muse-4.0/synthi/deicsonze.so
%%FLUIDSYNTH%%lib/muse-4.0/synthi/fluid_synth.so
lib/muse-4.0/synthi/organ.so
lib/muse-4.0/synthi/simpledrums.so
lib/muse-4.0/synthi/vam.so
lib/muse-4.1/converters/rubberband_converter.so
lib/muse-4.1/converters/src_converter.so
lib/muse-4.1/converters/zita_resampler_converter.so
lib/muse-4.1/modules/libaudio_converter_plugin.so
lib/muse-4.1/modules/libmuse_al.so
lib/muse-4.1/modules/libmuse_arranger.so
lib/muse-4.1/modules/libmuse_audio_convert.so
lib/muse-4.1/modules/libmuse_awl.so
lib/muse-4.1/modules/libmuse_cliplist.so
lib/muse-4.1/modules/libmuse_components.so
lib/muse-4.1/modules/libmuse_core.so
lib/muse-4.1/modules/libmuse_ctrl.so
lib/muse-4.1/modules/libmuse_driver.so
lib/muse-4.1/modules/libmuse_evdata_module.so
lib/muse-4.1/modules/libmuse_icons.so
lib/muse-4.1/modules/libmuse_instruments.so
lib/muse-4.1/modules/libmuse_latency_compensator_module.so
lib/muse-4.1/modules/libmuse_liste.so
lib/muse-4.1/modules/libmuse_lv2_gtk2_support.so
lib/muse-4.1/modules/libmuse_lv2host_module.so
lib/muse-4.1/modules/libmuse_marker.so
lib/muse-4.1/modules/libmuse_master.so
lib/muse-4.1/modules/libmuse_memory_module.so
lib/muse-4.1/modules/libmuse_midi_controller_module.so
lib/muse-4.1/modules/libmuse_midiedit.so
lib/muse-4.1/modules/libmuse_midnam_module.so
lib/muse-4.1/modules/libmuse_mixer.so
lib/muse-4.1/modules/libmuse_mpevent_module.so
lib/muse-4.1/modules/libmuse_mplugins.so
lib/muse-4.1/modules/libmuse_plugin_cache_reader_module.so
lib/muse-4.1/modules/libmuse_plugin_cache_writer_module.so
lib/muse-4.1/modules/libmuse_plugin_list_module.so
lib/muse-4.1/modules/libmuse_plugin_rdf_module.so
lib/muse-4.1/modules/libmuse_plugin_scan_module.so
lib/muse-4.1/modules/libmuse_remote.so
lib/muse-4.1/modules/libmuse_simpler_plugin.so
lib/muse-4.1/modules/libmuse_simpler_plugingui.so
lib/muse-4.1/modules/libmuse_string.so
lib/muse-4.1/modules/libmuse_synti.so
lib/muse-4.1/modules/libmuse_sysex_helper_module.so
lib/muse-4.1/modules/libmuse_time_stretch_module.so
lib/muse-4.1/modules/libmuse_wave_module.so
lib/muse-4.1/modules/libmuse_waveedit.so
lib/muse-4.1/modules/libmuse_wavepreview_module.so
lib/muse-4.1/modules/libmuse_widgets.so
lib/muse-4.1/modules/libmuse_widgets_functiondialogs.so
lib/muse-4.1/modules/libmuse_xml_module.so
lib/muse-4.1/plugins/doublechorus.so
lib/muse-4.1/plugins/freeverb.so
lib/muse-4.1/plugins/pandelay.so
lib/muse-4.1/synthi/deicsonze.so
%%FLUIDSYNTH%%lib/muse-4.1/synthi/fluid_synth.so
lib/muse-4.1/synthi/organ.so
lib/muse-4.1/synthi/simpledrums.so
lib/muse-4.1/synthi/vam.so
man/man1/grepmidi.1.gz
man/man1/muse4.1.gz
share/applications/org.musesequencer.Muse4.desktop
share/applications/io.github.muse_sequencer.Muse.desktop
share/icons/hicolor/128x128/apps/muse.png
share/icons/hicolor/64x64/apps/muse.png
share/metainfo/org.musesequencer.Muse4.appdata.xml
share/metainfo/io.github.muse_sequencer.Muse.appdata.xml
share/mime/packages/muse.xml
%%DATADIR%%/demos/rasen.med
%%DATADIR%%/didyouknow.txt
Expand All @@ -80,6 +80,7 @@ share/mime/packages/muse.xml
%%DATADIR%%/instruments/AlesisQS6.idf
%%DATADIR%%/instruments/Classic_cantabile_sp-250.idf
%%DATADIR%%/instruments/Drumgizmo - CrocellKit.idf
%%DATADIR%%/instruments/Edirol-SD90.idf
%%DATADIR%%/instruments/Emu-4mbgsgmmt-sf.idf
%%DATADIR%%/instruments/Hammond_XB-1.idf
%%DATADIR%%/instruments/KORG microSTATION combinations.idf
Expand All @@ -99,10 +100,12 @@ share/mime/packages/muse.xml
%%DATADIR%%/instruments/Roland-E28.idf
%%DATADIR%%/instruments/Roland-JV90.idf
%%DATADIR%%/instruments/Roland-MT32.idf
%%DATADIR%%/instruments/Roland-SC55mkII.idf
%%DATADIR%%/instruments/Roland-SC88.idf
%%DATADIR%%/instruments/Roland-SCD70.idf
%%DATADIR%%/instruments/Roland-XP30.idf
%%DATADIR%%/instruments/Roland_FantomXR.idf
%%DATADIR%%/instruments/Roland_SC-88Pro.idf
%%DATADIR%%/instruments/Roland_SRX-02.idf
%%DATADIR%%/instruments/Roland_SRX-09.idf
%%DATADIR%%/instruments/Waldorf-Q.idf
Expand Down Expand Up @@ -141,7 +144,6 @@ share/mime/packages/muse.xml
%%DATADIR%%/locale/muse_it.qm
%%DATADIR%%/locale/muse_pl.qm
%%DATADIR%%/locale/muse_ru.qm
%%DATADIR%%/locale/muse_sv_SE.qm
%%DATADIR%%/metronome/factory_presets.mdf
%%DATADIR%%/metronome/klick1.wav
%%DATADIR%%/metronome/klick2.wav
Expand Down

0 comments on commit d4f8363

Please sign in to comment.