diff --git a/0dde64eef84.patch b/0dde64eef84.patch new file mode 100644 index 0000000..cb37cd0 --- /dev/null +++ b/0dde64eef84.patch @@ -0,0 +1,18 @@ +commit 0dde64eef849027d16a0ac83b15bc8789d678564 +Author: Jerry James +Date: Tue Dec 6 13:19:35 2022 -0700 + + Fix cmake error when building with jack on Linux + +diff --git a/build/cmake/FindJack.cmake b/build/cmake/FindJack.cmake +index 6713e3aeef..d1676fa82b 100644 +--- a/build/cmake/FindJack.cmake ++++ b/build/cmake/FindJack.cmake +@@ -28,6 +28,7 @@ IF(BUILD_JACK) + set (JACK_LIB "$ENV{${progenv}}/Jack/lib/libjack.a") + MESSAGE("JACK support enabled.") + ELSE(MINGW OR MSVC) ++ include(UsePkgConfig1) + PKGCONFIG1 (jack ${JACK_MIN_VERSION} JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP) + IF(JACK_INCDIR) + MESSAGE(STATUS "${JACK_LONGNAME} >= ${JACK_MIN_VERSION} found. jack support enabled.") diff --git a/musescore.changes b/musescore.changes index 05b487f..f822d73 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Jan 1 11:11:45 UTC 2023 - Marcus Rueckert + +- Fix audio playback support in muse score + https://github.com/musescore/MuseScore/issues/11220#issuecomment-1365822403 + + - Fix jack finder by backporting 0dde64eef84.patch: + Though the jack code in Musescore seems to be unused and only + alsa seems supported + - Require alsa-plugins-pulse or pipewire-alsa to make playing out + of the box + +- prepare disabling the update check but it is currently not + possible due to + https://github.com/musescore/MuseScore/issues/15617 + +- cmake searches for ogg support: add proper BR + ------------------------------------------------------------------- Thu Dec 29 14:17:31 UTC 2022 - Hans-Peter Jansen diff --git a/musescore.spec b/musescore.spec index e0021c5..1687110 100644 --- a/musescore.spec +++ b/musescore.spec @@ -1,7 +1,7 @@ # # spec file for package musescore # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,6 +46,8 @@ Source4: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General Source5: README.SUSE # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch0: use-qtmake-qt5.patch +# PATCH-FIX-UPSTREAM: fix build with jack on linux. +Patch1: 0dde64eef84.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -79,6 +81,7 @@ BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(sndfile) @@ -88,6 +91,8 @@ BuildRequires: pkgconfig(vorbisfile) Requires: %{name}-fonts = %{version}-%{release} Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 +Requires: ( alsa-plugins-pulse if pulseaudio ) +Requires: ( pipewire-alsa if pipewire ) %description MuseScore is a graphical music typesetter. It allows for note entry on a @@ -137,11 +142,19 @@ sed -i 's/\(target_link_libraries(mscore ${LINK_LIB}\)/\1 ${CMAKE_DL_LIBS}/' src %build %define __builddir build.release +# TODO: +# find out what those do: +# BUILD_VIDEOEXPORT_MODULE:BOOL=ON +# find out how to enable this +# BUILD_VST:BOOL=ON +# -DBUILD_UPDATE_MODULE:BOOL=OFF triggers bug https://github.com/musescore/MuseScore/issues/15617 %cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DMUSESCORE_BUILD_CONFIG=release \ -DBUILD_UNIT_TESTS=OFF \ -DUSE_SYSTEM_FREETYPE=ON \ + -DBUILD_JACK:BOOL=ON \ + -DBUILD_UPDATE_MODULE:BOOL=ON \ -DBUILD_CRASHPAD_CLIENT=OFF \ -DMUSESCORE_REVISION=%{revision} %make_jobs