aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2023-08-09 01:17:06 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2023-08-09 01:18:54 +0000
commit4a5b7db836350c0a3ecbf6f1737c509ce02a96e0 (patch)
tree27af210ba619e0b484be89a258446622122bb852
parenteb5bc9e3d65bb9499f18105d89135a000172cdd7 (diff)
downloadports-4a5b7db836350c0a3ecbf6f1737c509ce02a96e0.tar.gz
ports-4a5b7db836350c0a3ecbf6f1737c509ce02a96e0.zip
audio/muse-sequencer: Update 4.1.0 → 4.1.0-20230803
Reported by: portscout
-rw-r--r--audio/muse-sequencer/Makefile13
-rw-r--r--audio/muse-sequencer/distinfo6
-rw-r--r--audio/muse-sequencer/files/patch-CMakeLists.txt39
-rw-r--r--audio/muse-sequencer/files/patch-awl_knob.h6
-rw-r--r--audio/muse-sequencer/files/patch-awl_slider.cpp6
-rw-r--r--audio/muse-sequencer/files/patch-libs_string_hex__float.cpp13
-rw-r--r--audio/muse-sequencer/files/patch-muse_CMakeLists.txt11
-rw-r--r--audio/muse-sequencer/files/patch-muse_app.cpp20
-rw-r--r--audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt6
-rw-r--r--audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt8
-rw-r--r--audio/muse-sequencer/pkg-plist2
11 files changed, 68 insertions, 62 deletions
diff --git a/audio/muse-sequencer/Makefile b/audio/muse-sequencer/Makefile
index 35bace8423e2..41bd4b7ce787 100644
--- a/audio/muse-sequencer/Makefile
+++ b/audio/muse-sequencer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= muse-sequencer
-DISTVERSION= 4.1.0
-PORTREVISION= 2
+DISTVERSION= 4.1.0-20230803
+DISTVERSIONSUFFIX= -g53bc9e4
CATEGORIES= audio
MAINTAINER= yuri@FreeBSD.org
@@ -14,7 +14,8 @@ BROKEN_i386= compilation breaks: unknown type name 'intptr_t'; did you mean '__i
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \
lv2>0:audio/lv2
-LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
+LIB_DEPENDS= libfftw3.so:math/fftw3 \
+ libharfbuzz.so:print/harfbuzz \
libinstpatch-1.0.so:audio/libinstpatch \
libjack.so:audio/jack \
liblash.so:audio/lash \
@@ -22,15 +23,17 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
liblo.so:audio/liblo \
librtaudio.so:audio/rtaudio \
liblrdf.so:textproc/liblrdf \
+ librubberband.so:audio/rubberband \
libsamplerate.so:audio/libsamplerate \
libserd-0.so:devel/serd \
libsndfile.so:audio/libsndfile \
libsord-0.so:devel/sord \
libsratom-0.so:audio/sratom
-USES= cmake compiler:c++11-lib desktop-file-utils gl gnome localbase:ldflags qt:5 pkgconfig python shared-mime-info shebangfix
+USES= cmake compiler:c++11-lib desktop-file-utils gl gnome kde:5 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_KDE= ecm:build
USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libsigc++20 pango pangomm
USE_LDCONFIG= yes
@@ -46,6 +49,8 @@ WRKSRC_SUBDIR= src
DATADIR= ${PREFIX}/share/muse-${DISTVERSION:R}
DOCSDIR= ${PREFIX}/share/doc/muse-${DISTVERSION:R}
+BINARY_ALIAS= git=false
+
OPTIONS_DEFINE= FLUIDSYNTH DOCS
OPTIONS_DEFAULT= FLUIDSYNTH
OPTIONS_SUB= yes
diff --git a/audio/muse-sequencer/distinfo b/audio/muse-sequencer/distinfo
index 3e5654ee5e2c..bf59ab2b4c87 100644
--- a/audio/muse-sequencer/distinfo
+++ b/audio/muse-sequencer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1657317357
-SHA256 (muse-sequencer-muse-4.1.0_GH0.tar.gz) = b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
-SIZE (muse-sequencer-muse-4.1.0_GH0.tar.gz) = 12323398
+TIMESTAMP = 1691535785
+SHA256 (muse-sequencer-muse-4.1.0-20230803-g53bc9e4_GH0.tar.gz) = 1b356b977653a7fec0e5dc42e11331faf3fdcdd3a58910f5d887a0986e2e4c32
+SIZE (muse-sequencer-muse-4.1.0-20230803-g53bc9e4_GH0.tar.gz) = 12497103
diff --git a/audio/muse-sequencer/files/patch-CMakeLists.txt b/audio/muse-sequencer/files/patch-CMakeLists.txt
index a2d5e0ebd0f5..585415d52934 100644
--- a/audio/muse-sequencer/files/patch-CMakeLists.txt
+++ b/audio/muse-sequencer/files/patch-CMakeLists.txt
@@ -1,25 +1,20 @@
---- CMakeLists.txt.orig 2022-07-12 10:34:16 UTC
+--- CMakeLists.txt.orig 2023-08-08 23:49:24 UTC
+++ CMakeLists.txt
-@@ -708,14 +708,14 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
- INCLUDE(CPack)
- ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+@@ -761,7 +761,7 @@ message("Existing CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_F
--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)
+ # 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 "${CMAKE_CXX_FLAGS} -Werror=format-security -Wextra -Winvalid-pch -fexceptions -Wall -fPIC")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Winvalid-pch -fexceptions -Wall -fPIC")
- # NOTE: share/ directory needs to be at the end so that the translations
- # are scanned before coming to share/locale
+ # 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)
+@@ -776,7 +776,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${
+ # 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)
+ # Debug usually has no -O setting. Let's give it a default one.
+-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS_DEBUG} -DQT_DEBUG -Werror")
++set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS_DEBUG} -DQT_DEBUG")
+
+ message("Final CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+ message("Final CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
diff --git a/audio/muse-sequencer/files/patch-awl_knob.h b/audio/muse-sequencer/files/patch-awl_knob.h
index 056854005f04..b324ba2ccf21 100644
--- a/audio/muse-sequencer/files/patch-awl_knob.h
+++ b/audio/muse-sequencer/files/patch-awl_knob.h
@@ -1,7 +1,7 @@
---- awl/knob.h.orig 2020-05-18 18:30:06 UTC
+--- awl/knob.h.orig 2023-08-03 19:28:45 UTC
+++ awl/knob.h
-@@ -24,6 +24,7 @@
- #define __AWLKNOB_H__
+@@ -30,6 +30,7 @@
+ #include <QSize>
#include "aslider.h"
+#include <QPainterPath>
diff --git a/audio/muse-sequencer/files/patch-awl_slider.cpp b/audio/muse-sequencer/files/patch-awl_slider.cpp
index 8df844cbdd04..885646927b07 100644
--- a/audio/muse-sequencer/files/patch-awl_slider.cpp
+++ b/audio/muse-sequencer/files/patch-awl_slider.cpp
@@ -1,8 +1,8 @@
---- awl/slider.cpp.orig 2020-05-18 18:33:16 UTC
+--- awl/slider.cpp.orig 2023-08-03 19:28:45 UTC
+++ awl/slider.cpp
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
+ #include "awl/slider.h"
- #include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
diff --git a/audio/muse-sequencer/files/patch-libs_string_hex__float.cpp b/audio/muse-sequencer/files/patch-libs_string_hex__float.cpp
new file mode 100644
index 000000000000..5c37e3aacb40
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-libs_string_hex__float.cpp
@@ -0,0 +1,13 @@
+- workaround for https://github.com/muse-sequencer/muse/issues/1236
+
+--- libs/string/hex_float.cpp.orig 2023-08-09 00:25:02 UTC
++++ libs/string/hex_float.cpp
+@@ -70,6 +70,8 @@ double museStringToDouble(const QString &s, bool *ok)
+ if(ok)
+ *ok = true;
+
++ return value;
++
+ #else // C++ istringstream does not support hexfloat
+
+ // Is it a hex number?
diff --git a/audio/muse-sequencer/files/patch-muse_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_CMakeLists.txt
new file mode 100644
index 000000000000..f6b07d12b7a2
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- muse/CMakeLists.txt.orig 2023-08-09 00:00:30 UTC
++++ muse/CMakeLists.txt
+@@ -322,7 +322,7 @@ target_link_libraries(core
+
+ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+ message("Warning: HAVE_CXX_ATOMICS_WITHOUT_LIB or HAVE_CXX_ATOMICS64_WITHOUT_LIB are false. Linking core with required libatomic.")
+- target_link_libraries(core atomic)
++ #target_link_libraries(core atomic)
+ endif(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+
+ if(HAVE_LASH)
diff --git a/audio/muse-sequencer/files/patch-muse_app.cpp b/audio/muse-sequencer/files/patch-muse_app.cpp
deleted file mode 100644
index 144b1715d028..000000000000
--- a/audio/muse-sequencer/files/patch-muse_app.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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()) {
diff --git a/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt
index 26417c4373a9..8fd5a2df7db0 100644
--- a/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt
+++ b/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt
@@ -4,10 +4,10 @@ muse/components/editevent.h:26:10: fatal error: 'ui_editnotedialogbase.h' file n
^~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
---- muse/instruments/CMakeLists.txt.orig 2021-04-08 11:28:12 UTC
+--- muse/instruments/CMakeLists.txt.orig 2023-08-03 19:28:45 UTC
+++ muse/instruments/CMakeLists.txt
-@@ -55,6 +55,8 @@ add_library ( instruments ${MODULES_BUILD}
- ${instruments_uis}
+@@ -36,6 +36,8 @@ add_library ( instruments ${MODULES_BUILD}
+ ${instruments_mocs}
)
+add_dependencies(instruments components)
diff --git a/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt
index 18ca590410b0..5b3d56cf8321 100644
--- a/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt
+++ b/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt
@@ -4,14 +4,14 @@ muse/components/plugindialog.h:4:10: fatal error: 'ui_plugindialogbase.h' file n
^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
---- muse/mixer/CMakeLists.txt.orig 2021-04-08 11:35:45 UTC
+--- muse/mixer/CMakeLists.txt.orig 2023-08-03 19:28:45 UTC
+++ muse/mixer/CMakeLists.txt
-@@ -64,6 +64,8 @@ add_library ( mixer ${MODULES_BUILD}
- ${mixer_uis}
+@@ -64,6 +64,8 @@ set (FILES_TO_TRANSLATE
+ CACHE INTERNAL ""
)
+add_dependencies(mixer components)
+
##
- ## Append to the list of translations
+ ## Compilation flags and target name
##
diff --git a/audio/muse-sequencer/pkg-plist b/audio/muse-sequencer/pkg-plist
index 1a39f6fb1316..782229fc596b 100644
--- a/audio/muse-sequencer/pkg-plist
+++ b/audio/muse-sequencer/pkg-plist
@@ -203,7 +203,9 @@ share/mime/packages/muse.xml
%%DATADIR%%/scripts/RandomizeVelocityRelative
%%DATADIR%%/scripts/RemoveAftertouch
%%DATADIR%%/scripts/RemoveShortEvents
+%%DATADIR%%/scripts/Reverse
%%DATADIR%%/scripts/Rhythm1
+%%DATADIR%%/scripts/SpeedChange
%%DATADIR%%/scripts/SpeedDouble
%%DATADIR%%/scripts/SpeedHalf
%%DATADIR%%/scripts/SwingQuantize1