From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A699115838C for ; Mon, 22 Jan 2024 06:06:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9C25E2A0A; Mon, 22 Jan 2024 06:06:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3A77E2A0A for ; Mon, 22 Jan 2024 06:06:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E51FE34320E for ; Mon, 22 Jan 2024 06:06:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34567AB4 for ; Mon, 22 Jan 2024 06:06:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705903594.7abb83f9a0ce31daa1e7144b1df94215dbac8f06.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7abb83f9a0ce31daa1e7144b1df94215dbac8f06 X-VCS-Branch: master Date: Mon, 22 Jan 2024 06:06:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c61a6f9c-aa43-4364-990c-8e6566ce7435 X-Archives-Hash: c592af26a3f69281746a844328db30c7 commit: 7abb83f9a0ce31daa1e7144b1df94215dbac8f06 Author: Sam James gentoo org> AuthorDate: Mon Jan 22 06:05:24 2024 +0000 Commit: Sam James gentoo 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 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 }