media-sound/musescore: partially updated live ebuild - doesn't configure yet

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

2 files changed, 36 insertions, 26 deletions

diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch
new file mode 100644
index 000000000000..be611875e6a7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch
@@ -0,0 +1,26 @@
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -275,10 +275,10 @@ if (MUSE_MODULE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/lame lame)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+     set(MODULE_LINK
+         ${MODULE_LINK}
+-        lame
++        PkgConfig::lame
+     )
+ 
+     include(cmake/SetupOpusEnc.cmake)
+--- 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"
+ 
+ #include "log.h"
+ 
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 52aebfbedfc0..8ddeeb119d63 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -30,28 +30,16 @@ IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 "
 RDEPEND="
 	dev-libs/tinyxml2:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtnetworkauth:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5[widgets]
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
+	dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtnetworkauth:6
+	dev-qt/qtsvg:6
+	dev-qt/qttools:6[assistant]
 	>=media-libs/alsa-lib-1.0.0
 	media-libs/flac:=
 	>=media-libs/freetype-2.5.2
@@ -63,15 +51,13 @@ RDEPEND="
 	jack? ( virtual/jack )
 	video? ( media-video/ffmpeg )
 "
-# dev-cpp/gtest is required even when tests are disabled!
 DEPEND="
 	${RDEPEND}
-	dev-cpp/gtest
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
-	"${FILESDIR}/${PN}-9999-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )
 
@@ -89,11 +75,6 @@ src_prepare() {
 
 	# Move soundfonts to the correct directory
 	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() {
@@ -113,7 +94,10 @@ src_configure() {
 		-DMUE_BUILD_UPDATE_MODULE=OFF
 		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
 		-DMUE_COMPILE_USE_CCACHE=OFF
+		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
 		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
+		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
 		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
 		-DMUSESCORE_BUILD_MODE=release