diff options
Diffstat (limited to 'media-sound/musescore/files')
3 files changed, 150 insertions, 2 deletions
diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch index fd5ade55ed42..a9e871f12d77 100644 --- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch +++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6437963..2a173b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE) diff --git a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch new file mode 100644 index 000000000000..6c299d90da67 --- /dev/null +++ b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch @@ -0,0 +1,121 @@ +Unbundling of all dependencies which are currently available as system packages +and have not been modified (to our knowledge) by MuseScore. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,7 +206,7 @@ if (BUILD_UNIT_TESTS) + FULL_DOCS "List XML files outputted by google test." + ) + +- add_subdirectory(thirdparty/googletest) ++ find_package(GTest REQUIRED) + endif(BUILD_UNIT_TESTS) + + add_subdirectory(share) +--- a/src/framework/audio/CMakeLists.txt ++++ b/src/framework/audio/CMakeLists.txt +@@ -216,11 +216,18 @@ if (ENABLE_AUDIO_EXPORT) + ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h + ) + +- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame) +- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc) +- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac) ++ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame) ++ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc) ++ pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac) ++ pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++) + +- set(MODULE_LINK ${MODULE_LINK} lame opusenc flac) ++ set(MODULE_LINK ++ ${MODULE_LINK} ++ PkgConfig::lame ++ PkgConfig::libopusenc ++ PkgConfig::flac ++ PkgConfig::flacpp ++ ) + endif() + + if (OS_IS_MAC) +--- a/src/framework/audio/internal/encoders/mp3encoder.cpp ++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp +@@ -22,7 +22,7 @@ + + #include "mp3encoder.h" + +-#include "lame.h" ++#include "lame/lame.h" + + using namespace mu; + using namespace mu::audio; +--- a/src/framework/audio/internal/encoders/oggencoder.cpp ++++ b/src/framework/audio/internal/encoders/oggencoder.cpp +@@ -22,7 +22,7 @@ + + #include "oggencoder.h" + +-#include "opusenc.h" ++#include "opus/opusenc.h" + + #include "log.h" + +--- a/src/framework/global/CMakeLists.txt ++++ b/src/framework/global/CMakeLists.txt +@@ -105,8 +105,6 @@ set(MODULE_SRC + ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h + ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp + ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h +- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp +- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp +@@ -124,6 +122,8 @@ set(MODULE_SRC + ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h + ) + ++find_package(tinyxml2 REQUIRED) ++ + if (GLOBAL_NO_INTERNAL) + set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL) + else() +@@ -184,6 +184,7 @@ set(MODULE_INCLUDE + set(MODULE_LINK + ${FS_LIB} + ${Z_LIB} ++ tinyxml2::tinyxml2 + ) + + if (OS_IS_MAC) +--- a/src/framework/global/serialization/xmldom.cpp ++++ b/src/framework/global/serialization/xmldom.cpp +@@ -21,7 +21,7 @@ + */ + #include "xmldom.h" + +-#include "thirdparty/tinyxml/tinyxml2.h" ++#include <tinyxml2.h> + + #include "log.h" + +--- a/src/framework/global/serialization/xmlstreamreader.cpp ++++ b/src/framework/global/serialization/xmlstreamreader.cpp +@@ -23,7 +23,7 @@ + + #include <cstring> + +-#include "thirdparty/tinyxml/tinyxml2.h" ++#include <tinyxml2.h> + + #include "log.h" + +--- a/src/framework/testing/gtest.cmake ++++ b/src/framework/testing/gtest.cmake +@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQ + target_link_libraries(${MODULE_TEST} + Qt5::Core + Qt5::Gui +- gmock ++ GTest::gmock + global + ${MODULE_TEST_LINK} + ) diff --git a/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch new file mode 100644 index 000000000000..078662a66bdb --- /dev/null +++ b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch @@ -0,0 +1,29 @@ +--- a/build/cmake/SetupAppImagePackaging.cmake ++++ b/build/cmake/SetupAppImagePackaging.cmake +@@ -85,7 +85,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE + # Compress man pages if gzip is installed (don't on OpenBSD) + # Note: Compressing man pages is normal on Linux but not OpenBSD + find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." ) +- if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") ++ if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false) + message(STATUS "Found 'gzip'. Man pages will be compressed.") + set(MAN_TARGET ${MAN_BUILD}) + set(MAN_EXTENSION ${MAN_EXTENSION}.gz) +@@ -102,7 +102,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE + COMMAND echo "Man pages have been compressed ready for installation." + VERBATIM + ) +- else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") ++ else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false) + if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") + message(STATUS "System is OpenBSD: Man pages will not be compressed.") + else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") +@@ -112,7 +112,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE + COMMAND echo "Man pages will be installed uncompressed." + VERBATIM + ) +- endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") ++ endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false) + # Install man pages in either compressed or uncompressed form + install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc) + # Create symlink alias for man pages so `man musescore` = `man mscore` |