public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
Date: Sun,  4 Aug 2024 10:14:19 +0000 (UTC)	[thread overview]
Message-ID: <1722766457.5de7b085ed9ca4babd3f0f9891b99a9d9338cc5a.fordfrog@gentoo> (raw)

commit:     5de7b085ed9ca4babd3f0f9891b99a9d9338cc5a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 10:13:47 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 10:14:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de7b085

media-sound/musescore: bump to 4.3.2

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

 media-sound/musescore/Manifest                     |   1 +
 .../files/musescore-4.3.2-unbundle-deps.patch      |  48 +++++++
 media-sound/musescore/musescore-4.3.2.ebuild       | 143 +++++++++++++++++++++
 3 files changed, 192 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 64ea10b591d3..249ebeb79d4d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,3 +2,4 @@ DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df
 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
+DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5

diff --git a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
new file mode 100644
index 000000000000..6a3f44702f27
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -188,7 +188,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,10 +268,10 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+     set(MODULE_LINK
+         ${MODULE_LINK}
+-        lame
++        PkgConfig::lame
+     )
+     if (MUE_COMPILE_USE_SYSTEM_OPUSENC)
+         pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
+--- 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/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.3.2.ebuild b/media-sound/musescore/musescore-4.3.2.ebuild
new file mode 100644
index 000000000000..b5a97d520654
--- /dev/null
+++ b/media-sound/musescore/musescore-4.3.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	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
+	"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack test video"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	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
+	>=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:=
+	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.2.0-uncompressed-man-pages.patch"
+	"${FILESDIR}/${PN}-4.3.2-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_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() {
+	# confuses rcc, bug #908808
+	filter-lto
+
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-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_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
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build lrelease manpages
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}


             reply	other threads:[~2024-08-04 10:14 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-04 10:14 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-29 12:36 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/ Miroslav Šulc
2024-08-27  9:12 Miroslav Šulc
2024-08-04 11:24 Miroslav Šulc
2024-08-04 11:16 Miroslav Šulc
2023-01-09 15:07 Sam James
2023-01-09 12:03 Sam James
2021-02-28 11:47 Miroslav Šulc
2020-10-17  9:07 Miroslav Šulc
2020-08-06 13:28 Miroslav Šulc
2020-04-02 12:59 Miroslav Šulc
2020-03-04 16:19 Miroslav Šulc
2020-01-04 14:58 Miroslav Šulc
2019-04-28 23:45 Andreas Sturmlechner
2019-02-01 19:50 Miroslav Šulc
2018-12-24  0:51 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-17 22:04 Andreas Sturmlechner
2017-12-09 23:13 Michał Górny
2017-07-30 15:45 David Seifert
2017-01-30 13:20 Johannes Huber
2017-01-04 10:15 David Seifert
2016-11-29  8:29 David Seifert

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=1722766457.5de7b085ed9ca4babd3f0f9891b99a9d9338cc5a.fordfrog@gentoo \
    --to=fordfrog@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