Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package musescore for openSUSE:Factory checked in at 2026-10-03 21:26:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musescore (Old) and /work/SRC/openSUSE:Factory/.musescore.new.1631729 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musescore" Sat Oct 3 21:26:12 2026 rev:58 rq:1382256 version:4.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/musescore/musescore.changes 2026-08-28 19:48:25.049147404 +0200 +++ /work/SRC/openSUSE:Factory/.musescore.new.1631729/musescore.changes 2026-10-03 21:26:20.171226060 +0200 @@ -1,0 +2,47 @@ +Sat Oct 3 16:11:01 UTC 2026 - Dirk Müller <[email protected]> + +- fix license string + +------------------------------------------------------------------- +Fri Oct 2 12:11:25 UTC 2026 - Cor Blom <[email protected]> + +- Add disable-aac.patch: for this fdk-aac is used, which is legally + problematic. Exact status is unclear at the moment. So we + disable it so that musescore can move on until the situation is + resolved (boo#1278345) +- Remove BuildRequires: libfdk-aac-devel (already required by other + packages) + +------------------------------------------------------------------- +Thu Oct 1 11:56:33 UTC 2026 - Cor Blom <[email protected]> + +- Add TODO for LICENSE.txt regarding including fonts so that it is + not forgotten (boo#1278345) +- Some cleaning up: remove references to ppc and add i586 to + excludearch: it does not build on it +- Also remove references to versions older than 16.0 + +------------------------------------------------------------------- +Wed Sep 30 07:26:37 UTC 2026 - Cor Blom <[email protected]> + +- Update to 4.7.5: + * New fretboard diagrams for guitars. + * Updated parameters and descriptions for several instruments + in the New Score dialog. + * Fixed empty header & footer variables (i.e. project properties) + in instrumental parts on MuseScore.com. + * Fixed app notarization on macOS (including the QuickLook + plugin, which had stopped working as a result). + * Several bug and crash fixes mainly related to opening or + importing scores. + * Minor engraving fixes. +- Add more licence tags (boo#1278345) + +------------------------------------------------------------------- +Wed Sep 9 20:05:01 UTC 2026 - Cor Blom <[email protected]> + +- Add unbundle-fdkaac.patch and add libfdk-aac-devel to + BuildRequires to build with system fdk-aac. In addition remove + the fdk-aac folder from the source (partly fixes boo#1278345) + +------------------------------------------------------------------- Old: ---- MuseScore-4.7.4.tar.gz New: ---- MuseScore-4.7.5.tar.gz disable-aac.patch unbundle-fdkaac.patch ----------(New B)---------- New: - Add disable-aac.patch: for this fdk-aac is used, which is legally problematic. Exact status is unclear at the moment. So we New: - Add unbundle-fdkaac.patch and add libfdk-aac-devel to BuildRequires to build with system fdk-aac. In addition remove ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musescore.spec ++++++ --- /var/tmp/diff_new_pack.4FhNxP/_old 2026-10-03 21:26:24.252396681 +0200 +++ /var/tmp/diff_new_pack.4FhNxP/_new 2026-10-03 21:26:24.254396764 +0200 @@ -26,8 +26,12 @@ %define version_lesser 4.7 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} + +# disable fdk_aac until linking to it has approval from legal (boo#1278345) +%bcond_with fdk_aac + Name: musescore -Version: 4.7.4 +Version: 4.7.5 Release: 0 Summary: A WYSIWYG music score typesetter # Licenses in MuseScore are a mess. To help other maintainers I give the following overview: @@ -50,7 +54,7 @@ # thirdparty/singleapp: the actual code has BSD 3 (although GPL and LGPL are included) # thirdparty/stb: MIT # the soundfont we musescore uses (see below) is BSD 3 -License: Apache-2.0 AND BSD-3-Clause AND FTL AND GPL-2.0-only AND GPL-3.0-only WITH Font-exception-2.0 AND GPL-2.0-or-later AND GFDL-1.2-only AND LGPL-2.0-only AND LGPL-2.1-only AND (GPL-2.0-only OR GPL-3.0-only) AND MIT +License: Apache-2.0 AND BSD-3-Clause AND FTL AND GPL-2.0-only AND GPL-3.0-only WITH Font-exception-2.0 AND GPL-2.0-only WITH Font-exception-2.0 AND GPL-2.0-or-later AND GPL-3.0-or-later AND GFDL-1.2-only AND LGPL-2.0-only AND LGPL-2.1-only AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND OFL-1.1 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-BY-SA-3.0 AND BSD-2-Clause AND BSL-1.0 AND ISC AND X11 AND Zlib Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://musescore.org Source0: https://github.com/musescore/MuseScore/archive/refs/tags/v%{version}.tar.gz#/MuseScore-%{version}.tar.gz @@ -65,18 +69,14 @@ # Patch for CVE-2025-56225 Patch0: musescore-CVE-2025-56225.patch Patch1: musescore-styleddropdownnavigation.patch +# Build with system fdk-aac (adapted from libs-unbundle patch in Fedora) +Patch2: unbundle-fdkaac.patch +%if %{without fdk_aac} +Patch3: disable-aac.patch +%endif BuildRequires: cmake BuildRequires: fdupes -%if 0%{?suse_version} < 1560 && 0%{?sle_version} <= 150600 -BuildRequires: gcc12 -BuildRequires: gcc12-c++ -%else BuildRequires: gcc-c++ -%endif -%ifarch ppc64 ppc64le -# PPC builds often have memory issues, limit the number of parallel jobs -BuildRequires: memory-constraints -%endif # Qt tools want an UTF-8 locale BuildRequires: glibc-locale-base @@ -132,9 +132,8 @@ Requires: %{name}-fonts = %{version}-%{release} Requires: qt6-qt5compat-imports Requires: ( alsa-plugins-pulse if pulseaudio ) -# For the following arch build fails in the crashpad client, -# Maybe repairable? Disabled until a solution is found by someone. -ExcludeArch: aarch64 ppc64 ppc64le +# Does not build for following archs +ExcludeArch: i586 %description MuseScore is a graphical music typesetter. It allows for note entry on a @@ -176,18 +175,12 @@ #TODO: check if still needed #sed -i 's/\(target_link_libraries(mscore ${LINK_LIB}\)/\1 ${CMAKE_DL_LIBS}/' src/main/CMakeLists.txt +# Remove bundled fdk-aac +rm -rf src/framework/audio/thirdparty/fdk-aac + %build export LC_ALL=C.UTF-8 export LANG=C.UTF-8 -# Limit memory / threads on PowerPC to avoid memory issues -%ifarch ppc64 ppc64le -%limit_build -m 2000 -%endif - -%if 0%{?suse_version} < 1560 && 0%{?sle_version} <= 150600 -export CC=gcc-12 -export CXX=g++-12 -%endif %define __builddir build.release # TODO: @@ -262,6 +255,8 @@ %fdupes %{buildroot}%{_prefix} %files +# TODO: report upstream: lines 8-10 claim all bundled fonts use the GNU Freefont +# License. This is incorrect (only 5 FreeSerif*.ttf files use it; the rest are OFL-1.1) %license LICENSE.txt %{_bindir}/%{rname} %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml ++++++ MuseScore-4.7.4.tar.gz -> MuseScore-4.7.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/musescore/MuseScore-4.7.4.tar.gz /work/SRC/openSUSE:Factory/.musescore.new.1631729/MuseScore-4.7.5.tar.gz differ: char 14, line 1 ++++++ disable-aac.patch ++++++ diff -ur a/src/framework/audio/engine/CMakeLists.txt b/src/framework/audio/engine/CMakeLists.txt --- a/src/framework/audio/engine/CMakeLists.txt 2026-10-02 12:25:57.273832913 +0200 +++ b/src/framework/audio/engine/CMakeLists.txt 2026-10-02 13:43:01.634983841 +0200 @@ -192,8 +192,6 @@ internal/export/flacencoder.h internal/export/wavencoder.cpp internal/export/wavencoder.h - internal/export/aacencoder.cpp - internal/export/aacencoder.h ) if(MUE_COMPILE_USE_SYSTEM_LAME) @@ -229,8 +227,6 @@ include(../cmake/SetupFlac.cmake) target_link_libraries(muse_audio_engine PRIVATE ${FLAC_TARGETS}) - - target_link_libraries(muse_audio_engine PRIVATE -lfdk-aac) endif() # MUSE_MODULE_AUDIO_EXPORT target_link_libraries(muse_audio_engine PRIVATE muse_audio_common) diff -ur a/src/framework/audio/engine/internal/export/soundtrackwriter.cpp b/src/framework/audio/engine/internal/export/soundtrackwriter.cpp --- a/src/framework/audio/engine/internal/export/soundtrackwriter.cpp 2026-08-31 09:09:34.000000000 +0200 +++ b/src/framework/audio/engine/internal/export/soundtrackwriter.cpp 2026-10-02 13:43:43.844016293 +0200 @@ -33,7 +33,6 @@ #include "oggencoder.h" #include "flacencoder.h" #include "wavencoder.h" -#include "aacencoder.h" #include "log.h" @@ -49,7 +48,6 @@ case SoundTrackType::OGG: return std::make_unique<encode::OggEncoder>(); case SoundTrackType::FLAC: return std::make_unique<encode::FlacEncoder>(); case SoundTrackType::WAV: return std::make_unique<encode::WavEncoder>(); - case SoundTrackType::AAC: return std::make_unique<encode::AacEncoder>(); case SoundTrackType::Undefined: break; } diff -ur a/src/importexport/audioexport/audioexportmodule.cpp b/src/importexport/audioexport/audioexportmodule.cpp --- a/src/importexport/audioexport/audioexportmodule.cpp 2026-08-31 09:09:34.000000000 +0200 +++ b/src/importexport/audioexport/audioexportmodule.cpp 2026-10-02 11:17:09.827317025 +0200 @@ -28,7 +28,6 @@ #include "internal/wavewriter.h" #include "internal/oggwriter.h" #include "internal/flacwriter.h" -#include "internal/aacwriter.h" #include "internal/audioexportconfiguration.h" @@ -59,7 +58,6 @@ writers->reg({ "mp3" }, std::make_shared<Mp3Writer>(iocContext())); writers->reg({ "ogg" }, std::make_shared<OggWriter>(iocContext())); writers->reg({ "flac" }, std::make_shared<FlacWriter>(iocContext())); - writers->reg({ "aac" }, std::make_shared<AacWriter>(iocContext())); } } diff -ur a/src/importexport/audioexport/CMakeLists.txt b/src/importexport/audioexport/CMakeLists.txt --- a/src/importexport/audioexport/CMakeLists.txt 2026-08-31 09:09:34.000000000 +0200 +++ b/src/importexport/audioexport/CMakeLists.txt 2026-10-02 11:15:14.912339590 +0200 @@ -36,6 +36,4 @@ internal/oggwriter.h internal/flacwriter.cpp internal/flacwriter.h - internal/aacwriter.cpp - internal/aacwriter.h ) diff -ur a/src/project/qml/MuseScore/Project/CMakeLists.txt b/src/project/qml/MuseScore/Project/CMakeLists.txt --- a/src/project/qml/MuseScore/Project/CMakeLists.txt 2026-08-31 09:09:34.000000000 +0200 +++ b/src/project/qml/MuseScore/Project/CMakeLists.txt 2026-10-02 11:20:37.323211008 +0200 @@ -90,7 +90,6 @@ internal/Export/OggSettingsPage.qml internal/Export/FlacSettingsPage.qml internal/Export/WavSettingsPage.qml - internal/Export/AacSettingsPage.qml internal/Export/PdfSettingsPage.qml internal/Export/PngSettingsPage.qml internal/Export/SvgSettingsPage.qml diff -ur a/src/project/qml/MuseScore/Project/internal/Export/exportdialogmodel.cpp b/src/project/qml/MuseScore/Project/internal/Export/exportdialogmodel.cpp --- a/src/project/qml/MuseScore/Project/internal/Export/exportdialogmodel.cpp 2026-08-31 09:09:34.000000000 +0200 +++ b/src/project/qml/MuseScore/Project/internal/Export/exportdialogmodel.cpp 2026-10-02 11:22:28.900188905 +0200 @@ -94,10 +94,6 @@ muse::qtrc("project/export", "FLAC audio"), muse::qtrc("project/export", "FLAC audio files"), "FlacSettingsPage.qml"), - ExportType::makeWithSuffixes({ "aac" }, - muse::qtrc("project/export", "AAC audio"), - muse::qtrc("project/export", "AAC audio files"), - "AacSettingsPage.qml"), #ifdef MUE_BUILD_IMPEXP_VIDEOEXPORT_MODULE ExportType::makeWithSuffixes({ "mp4" }, muse::qtrc("project/export", "MP4 video"), ++++++ unbundle-fdkaac.patch ++++++ --- MuseScore-4.7.2/src/framework/audio/engine/CMakeLists.txt.orig 2026-05-25 02:55:43.000000000 -0600 +++ MuseScore-4.7.2/src/framework/audio/engine/CMakeLists.txt 2026-05-26 10:20:47.014043570 -0600 @@ -230,8 +230,7 @@ if (MUSE_MODULE_AUDIO_EXPORT) include(../cmake/SetupFlac.cmake) target_link_libraries(muse_audio_engine PRIVATE ${FLAC_TARGETS}) - add_subdirectory(../thirdparty/fdk-aac fdk_aac EXCLUDE_FROM_ALL) - target_link_libraries(muse_audio_engine PRIVATE fdk_aac) + target_link_libraries(muse_audio_engine PRIVATE -lfdk-aac) endif() # MUSE_MODULE_AUDIO_EXPORT target_link_libraries(muse_audio_engine PRIVATE muse_audio_common) --- MuseScore-4.7.2/src/framework/audio/engine/internal/export/aacencoder.cpp.orig 2026-05-25 02:55:43.000000000 -0600 +++ MuseScore-4.7.2/src/framework/audio/engine/internal/export/aacencoder.cpp 2026-05-26 10:20:47.014395866 -0600 @@ -24,8 +24,8 @@ #include <algorithm> -#include "aacenc_lib.h" -#include "FDK_audio.h" +#include <fdk-aac/aacenc_lib.h> +#include <fdk-aac/FDK_audio.h> #include "../dsp/audiomathutils.h"
