gentoo auto-resync : 09:02:2024 - 11:33:56

5 files changed, 130 insertions, 6 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a31da28c73e0..0a8cb48e3625 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f3c5f0258fa3..b2613a55ea20 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -6,12 +6,13 @@ AUX musescore-4.2.0-dynamic_cast-crash.patch 342 BLAKE2B 1f36cc2648c10e8a79ad832
 AUX musescore-4.2.0-unbundle-deps.patch 3486 BLAKE2B 4262ad94a98dc0f425bea4309b64874e24aa40a00e1db6ccfd9240fb5801bcfd354b21a9e0d87511d8c1ed538764d6c0841edb661c95f32abc022f8792e2dca4 SHA512 39253f2882ec75aa67bd0144f6ae81aaa9a33ab629427c5feaa62414b1f9971665f67ba6743135c2a0b7bbca167b4dc4cd46f923ff3b82ee18fbc471221764a7
 AUX musescore-4.2.0-uncompressed-man-pages.patch 1556 BLAKE2B b2c032449faff891343af795dc7914c9a8f3774dee50565d1bdf7aed803b49ecf6623cc565c13a18dd021f82ed68ae7829522bd4efa5a81945a01d48ac3cb224 SHA512 9c67e752c7526106f6c0e2c6d39db2ad7844495596b519017cd609995fe76ea72ae9d93272ed1af4af43f63a0aee32915c96b73d8c07915358ce1c3adf636562
 AUX musescore-4.2.1-missing-headers.patch 1579 BLAKE2B d62776063fa580da011abee3461de770f7039d4e5f2633d2c4093896c7b46a45c2781997772394efaf050fa9a2555717ff2a25326a352f5a4f235b4ff111d9a7 SHA512 48f47706581fb57054fb5db6883218befcda45fdeda9ba894d62cef5a3b758df76f8994e23ca627feb0fbfcda4071b5cfae033f2cdb375737465ca5c60a9e9de
+AUX musescore-9999-unbundle-deps.patch 3559 BLAKE2B 3037cae81b80360135ee78a3cfd320cdb3a0e1c4904c0a342ef72506acdac2fc10a5b22dd0e28199a13f251b84e63b75d2968f032e053627b934b3ae76f57c75 SHA512 0abf3a8eeca2f01b87c396600f4c386908b6241d54d5d30d4b3d65edbcce6d6dbab9d40f0c798248f8882f3df5fd6574260f1506f341b03676be9667cd2147f2
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e SHA512 fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
 DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
 EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
 EBUILD musescore-4.0.2-r1.ebuild 3228 BLAKE2B 8323a5e2cab3e7fecf38882501359d208b2f7e8a5492570174b8b8b9e01263d875892933dc1424d525d402aa554f8d683c01d43e54b6c4edb0650556a3c63bbd SHA512 f1a9ed6e0523609ca6418e93a7b38fc2e181c6241fb4618c974fba0fd0411e3f5fa85f00b97b7a795aa6055a4ce62ae521a585eba5e67a851794be0e1467c374
-EBUILD musescore-4.2.1-r2.ebuild 3230 BLAKE2B 5ad1275913e4fcacb3c04ff6f4a70ac062a157c47801fca6bf5eee0fcc4e792138e1e6d42a192b46b7d615d95c5371e2b0c6d2ccaee1ff1b6920b3d8f16b6ba5 SHA512 e4e4d9a6fa40e147a1f0bbc37cb3d11e7bbbeec400fc989385b8fda409cbce12bc61f9b20cd0c236a8d861856428fe459e1ecc2ee49e5328966ff3307bb5d3b2
-EBUILD musescore-9999.ebuild 3230 BLAKE2B 5ad1275913e4fcacb3c04ff6f4a70ac062a157c47801fca6bf5eee0fcc4e792138e1e6d42a192b46b7d615d95c5371e2b0c6d2ccaee1ff1b6920b3d8f16b6ba5 SHA512 e4e4d9a6fa40e147a1f0bbc37cb3d11e7bbbeec400fc989385b8fda409cbce12bc61f9b20cd0c236a8d861856428fe459e1ecc2ee49e5328966ff3307bb5d3b2
+EBUILD musescore-4.2.1-r2.ebuild 3298 BLAKE2B 04dfce65ff3b9d4ff02ef4a87fd0ebbc1574c95f37886f83a3357c96fad62414c80da1b12fc7a6c05f2d9e1cc38b2cd1f3858d3b5d13e2e7d10776e4614e5497 SHA512 bfdd9c9fc2fce52875351df1d78f1f7c6030c1ec4d9459b2edc0d016efe5f690d314b1629442fb2cee8c3fa31775604e48ab7007fd59b756087940ae8132e284
+EBUILD musescore-9999.ebuild 3248 BLAKE2B aadad2103763240b219335e06a63b30e7ca849589e61ecc6a20c650b9db38f6235774bbf5ddf9d679f5d13b520cfe85438f411c14dfd9361bf01e9cd1054c8df SHA512 ea1bbcc75e439bc052eaeba806c6aae7fb55bb525d6a36b01421f832dca91e8d11e27124fbec76d5c5caf9494d3663540cb73d5d26caea0e188f7be895bdae8d
 MISC metadata.xml 1071 BLAKE2B be5b19a5f93c9a3c12a57de52873a0be0d1b32d000f28189746e3b529ccf35d1df29865ac68212ef4114fcb50b542a606565795fb811257b940ae86131a425fc SHA512 52db410ccfdd0bbfc4f6e67ee275b03b8247d29fe17994a396532622a22221f890c0f8e83cac7f6ef8a6b05022f4f18d4049496caa08b0ba61f5cbc23ec8798d
diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
new file mode 100644
index 000000000000..bac09d7eaa82
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
@@ -0,0 +1,120 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,7 +206,7 @@ if (MUE_BUILD_UNIT_TESTS)
+         FULL_DOCS "List XML files outputted by google test."
+     )
+ 
+-    add_subdirectory(thirdparty/googletest)
++    find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -268,11 +268,18 @@ if (MUE_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 (ARCH_IS_X86_64)
+--- 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
+@@ -112,9 +112,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}/thirdparty/tinyxml/mu_patch.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -132,6 +129,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()
+@@ -213,6 +212,7 @@ list(APPEND MODULE_INCLUDE
+ list(APPEND MODULE_LINK
+     ${FS_LIB}
+     ${Z_LIB}
++    tinyxml2::tinyxml2
+ )
+ 
+ if (MUE_ENABLE_CUSTOM_ALLOCATOR)
+--- 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
+@@ -25,7 +25,7 @@
+ 
+ #include "global/types/string.h"
+ 
+-#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 REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+     Qt5::Core
+     Qt5::Gui
+-    gmock
++    GTest::gmock
+     global
+     ${MODULE_TEST_LINK}
+     )
diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild
index de9540eac6c5..09adc4123499 100644
--- a/media-sound/musescore/musescore-4.2.1-r2.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test video"
+IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
 	media-libs/opus
 	media-sound/lame
 	sys-libs/zlib:=
+	jack? ( virtual/jack )
 	video? ( media-video/ffmpeg )
 "
 DEPEND="
@@ -111,6 +112,7 @@ src_configure() {
 		-DMUE_COMPILE_USE_CCACHE=OFF
 		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
 		-DMUSESCORE_BUILD_MODE=release
 	)
 	cmake_src_configure
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index de9540eac6c5..5ea71c947e32 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test video"
+IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
 	media-libs/opus
 	media-sound/lame
 	sys-libs/zlib:=
+	jack? ( virtual/jack )
 	video? ( media-video/ffmpeg )
 "
 DEPEND="
@@ -69,9 +70,8 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
-	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-9999-unbundle-deps.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
-	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
 )
 
 src_unpack() {
@@ -111,6 +111,7 @@ src_configure() {
 		-DMUE_COMPILE_USE_CCACHE=OFF
 		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
 		-DMUSESCORE_BUILD_MODE=release
 	)
 	cmake_src_configure