gentoo auto-resync : 22:01:2024 - 10:49:19

3 files changed, 54 insertions, 46 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8034ee6e9e96..3e6d50f833b4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 9b8aaea131da..86076eaf17c4 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -13,5 +13,5 @@ DIST musescore-4.2.0.tar.gz 135490976 BLAKE2B 518b26a5263fc6da520cead315bbb6bf4e
 EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
 EBUILD musescore-4.0.2.ebuild 3238 BLAKE2B c2d958c37ecaaee685185cef2205839226e134da29219a7ce13bef26816777c44e07ac804b79225301e76466dfd7d840cd6e9ee886763d94b54e362e3575386e SHA512 8fb14f660f29a32b9b0b2cd287b0dad74859aa45ae4a46fc1bd37262d6979542250b5528eb6e7c766472f02d6014e7b6961ba67909528d2deb454bb25af2c3e3
 EBUILD musescore-4.2.0.ebuild 3212 BLAKE2B 1ce86907ce505d53c059651d20eff253133a428ea2e214b6b6de7012b1658e40127a536557f110a2fd512ab41d085b04cf99c7efe45d2bd6be86524651a7ef1c SHA512 c18791f2f64ae3e088b7f68f1d512028897df55884ca84a33494e4e4444d7129c5c0809d49e3a62a62608dfba55dad17caab32d4573d9a2f14ca20023a026ef7
-EBUILD musescore-9999.ebuild 3220 BLAKE2B 663c302b8a28c087c525a3e79c930fe5af401cdfeddec7197c691ba28681d6d457d2231e338cc2db5a2327bfd797f7666332a7ee608143be6997f812baed38f5 SHA512 5f3bc962d9cf91cbc8029d270d1fb1abad34edffc62ea2bbd35ec2e9ff38ff9c71f1bdd028b65aafb6408312cc21b557eebf2728d51ae2a33ad24facafbb5d78
+EBUILD musescore-9999.ebuild 3240 BLAKE2B 5b2a759b7341b1c9ed5998c7dba5f04ba38b99f1bd5a31030b73ff51ece39aca42e2bae5593a80caea99461c80f096286f7b0afc9eab997fd125f5752c037807 SHA512 f1acda6bb62420068b419a97952aee00812d155a986e624bfcf354649031539bd252aa7d614ec33a70fd226b753829071cd400e34b79ba44a7a17f675853e1ec
 MISC metadata.xml 1071 BLAKE2B be5b19a5f93c9a3c12a57de52873a0be0d1b32d000f28189746e3b529ccf35d1df29865ac68212ef4114fcb50b542a606565795fb811257b940ae86131a425fc SHA512 52db410ccfdd0bbfc4f6e67ee275b03b8247d29fe17994a396532622a22221f890c0f8e83cac7f6ef8a6b05022f4f18d4049496caa08b0ba61f5cbc23ec8798d
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 42ab0eae69b0..d6842c473993 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-#CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake qmake-utils xdg check-reqs
+VIRTUALX_REQUIRED="test"
+inherit cmake qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
 else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
@@ -24,18 +26,19 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test webengine"
+IUSE="test video"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
-DEPEND="
+RDEPEND="
+	dev-libs/tinyxml2:=
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
@@ -47,22 +50,30 @@ DEPEND="
 	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
 	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
 	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
 	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-libs/libpulse )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
+	video? ( media-video/ffmpeg )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
 "
-RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
+	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+)
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
@@ -77,7 +88,12 @@ src_prepare() {
 	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
 }
 
 src_configure() {
@@ -85,43 +101,35 @@ src_configure() {
 	export PATH="$(qt5_get_bindir):${PATH}"
 
 	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASHPAD_CLIENT=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=OFF
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_UNIT_TESTS=$(usex test)
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DTRY_USE_CCACHE=OFF
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
+		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_SKIP_RPATH=TRUE
+		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
+		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
+		-DMUE_BUILD_UPDATE_MODULE=OFF
+		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
+		-DMUE_COMPILE_USE_CCACHE=OFF
+		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUSESCORE_BUILD_MODE=release
 	)
 	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
+	cmake_build lrelease manpages
 	cmake_src_compile
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 
-	# Hack to not install bundled libraries like libogg
+	# Hack to not install bundled libraries
 	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
 }