[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/
Date: Mon, 22 Jan 2024 06:06:48 +0000 (UTC)	[thread overview]
Message-ID: <1705903594.7abb83f9a0ce31daa1e7144b1df94215dbac8f06.sam@gentoo> (raw)

commit:     7abb83f9a0ce31daa1e7144b1df94215dbac8f06
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 06:05:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 06:06:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abb83f9

media-sound/musescore: sync live

Bug: https://bugs.gentoo.org/913160
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/musescore/musescore-9999.ebuild | 98 ++++++++++++++++-------------
 1 file changed, 53 insertions(+), 45 deletions(-)

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
 }

next             reply	other threads:[~2024-01-22  6:06 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-22  6:06 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-21 19:39 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/ Sam James
2025-07-21 19:38 Sam James
2025-06-17  1:05 Sam James
2025-04-26 18:21 Miroslav Šulc
2025-01-07 19:08 Arthur Zamarin
2025-01-07 19:07 Arthur Zamarin
2024-12-15 14:41 Miroslav Šulc
2024-10-25  8:26 Miroslav Šulc
2024-10-03  8:51 Miroslav Šulc
2024-09-16  9:01 Miroslav Šulc
2024-09-06  9:21 Miroslav Šulc
2024-08-05  3:36 Eli Schwartz
2024-08-04 11:59 Miroslav Šulc
2024-04-13  7:27 Miroslav Šulc
2024-04-13  7:27 Miroslav Šulc
2024-02-09  8:08 Miroslav Šulc
2024-02-09  8:08 Miroslav Šulc
2024-01-25  1:15 Sam James
2024-01-25  1:15 Sam James
2024-01-24  9:19 Miroslav Šulc
2023-06-13 17:16 Miroslav Šulc
2023-05-29 13:11 Andreas Sturmlechner
2023-01-14 19:17 Sam James
2022-07-03  3:55 Miroslav Šulc
2022-07-02 12:23 Agostino Sarubbo
2022-07-02 12:20 Agostino Sarubbo
2022-06-02  3:00 Sam James
2022-06-02  3:00 Sam James
2021-06-18 10:45 Miroslav Šulc
2021-03-11  8:15 Miroslav Šulc
2021-03-11  2:35 Sam James
2021-03-09 10:48 Sam James
2021-03-02  1:57 Sam James
2021-02-28 16:00 Sam James
2021-02-09 10:50 Miroslav Šulc
2021-01-28 13:38 Miroslav Šulc
2021-01-28 11:32 Miroslav Šulc
2020-11-18  8:57 Miroslav Šulc
2020-11-18  6:53 Agostino Sarubbo
2020-11-17 19:17 Agostino Sarubbo
2020-11-15  8:46 Miroslav Šulc
2020-11-14 20:32 Sam James
2020-11-12 21:03 Thomas Deutschmann
2020-10-17 13:17 Miroslav Šulc
2020-10-07  7:54 Miroslav Šulc
2020-09-09  9:42 Miroslav Šulc
2020-09-08 17:47 Miroslav Šulc
2020-09-06  0:30 Sam James
2020-09-05 21:16 Thomas Deutschmann
2020-09-05 18:37 Miroslav Šulc
2020-07-21  0:25 Sam James
2020-03-08 17:08 Miroslav Šulc
2020-03-08 10:42 Agostino Sarubbo
2020-03-08 10:37 Agostino Sarubbo
2020-03-04 13:03 Agostino Sarubbo
2020-03-03 16:21 Agostino Sarubbo
2020-03-03 14:14 Miroslav Šulc
2020-02-10 11:07 Miroslav Šulc
2020-02-10  8:18 Agostino Sarubbo
2020-02-09 10:31 Agostino Sarubbo
2020-02-08  0:43 Miroslav Šulc
2020-02-07 22:09 Miroslav Šulc
2020-02-01 10:41 Miroslav Šulc
2020-01-10 16:32 Miroslav Šulc
2020-01-04 18:22 Miroslav Šulc
2019-12-13 10:01 Miroslav Šulc
2019-12-13  7:36 Agostino Sarubbo
2019-12-03 10:03 Agostino Sarubbo
2019-11-28 19:56 Miroslav Šulc
2019-11-28 19:27 Miroslav Šulc
2019-10-31 17:48 Miroslav Šulc
2019-09-01 13:51 Miroslav Šulc
2019-05-01 15:20 Ben Kohler
2019-04-28 23:45 Andreas Sturmlechner
2019-04-28 23:45 Andreas Sturmlechner
2019-02-03 14:49 Miroslav Šulc
2019-02-03  9:30 Miroslav Šulc
2019-02-01 21:21 Miroslav Šulc
2018-08-22  6:58 Andreas Sturmlechner
2018-08-21 21:36 Andreas Sturmlechner
2018-08-21 21:36 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-18  9:52 Andreas Sturmlechner
2017-12-15 16:09 Miroslav Šulc
2017-01-30 13:20 Johannes Huber
2015-12-19 10:49 Patrice Clement

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:42ab0eae69b dfblob:d6842c47399 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1705903594.7abb83f9a0ce31daa1e7144b1df94215dbac8f06.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox