diff options
Diffstat (limited to 'media-sound/musescore')
-rw-r--r-- | media-sound/musescore/Manifest | 9 | ||||
-rw-r--r-- | media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch | 13 | ||||
-rw-r--r-- | media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch | 12 | ||||
-rw-r--r-- | media-sound/musescore/musescore-3.4.2.ebuild | 2 | ||||
-rw-r--r-- | media-sound/musescore/musescore-3.5.ebuild | 118 | ||||
-rw-r--r-- | media-sound/musescore/musescore-9999.ebuild | 23 |
6 files changed, 168 insertions, 9 deletions
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index f3a1f44a9fd4..a7c8b020eb87 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,7 +1,12 @@ AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb +AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5d73a1683ecdcb1103e1ab72796a53a56f6a1b15347875374a73853d5dde62e5b6e145ca2f8c8d61c30667f9397a2baba99b4f0d7 SHA512 3ee07a796f605e03fd1c8dda6dcf2d28f3f0344a77764f032195e3f17fb366c5aefa464b49858e5a07065ca74b9444aaf2222255c7eafdb7d6536d6dd51952b0 +AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda AUX musescore-9999-lambda-capture-this.patch 549 BLAKE2B 2aaf1ffb0383bce4f862d6172c3e0eb2fdd756a03b2345df9f8b1ea08f30d3ef29ea89c16f56268d0116e2e65c73b974f891ddef55da3816c2d1a94f234babc0 SHA512 bcf4ed087bca2ac9771dceaf0506d0870bcc1ebc2a233157550ad2bce209a2d24c6dbb36d7474f483ba4e2959b54bc7b368878c038dc79dfd50eab0c70f69eb1 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9 +DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4 -EBUILD musescore-3.4.2.ebuild 2687 BLAKE2B 9a8286431e2694bb88c0d91a7d761244049087cadf09562210539c9ddb80b7a6a8982d0db2bcfd1d9ebed5a98ff726481773b4cb3694fd80e2fd78397198a80f SHA512 e6bb0486a2de0d0c293c5c1afe730a09ed2b6676b1e038f811b6d0bdcda1712d2a68cf4dce8dbd5e7f38457270b35fa0d410a993f48247b19c86fdb1d7acfb87 -EBUILD musescore-9999.ebuild 2727 BLAKE2B 1b69766b774dde1b2a83b14555c02f0d2151c6b7668f2a21d09d713eb70fa9d21fd57bc4c094fa9bad4c5168e940c9772d818df2c618949db2413921631f43f3 SHA512 bd6efc3d80f001cd10ae9a9518d2150da8b86d4b29ead3b94a44857d2303d662c6e8a81ea72003d9cfa484d4e9b2a83ebc050d587acfb7bb5de791d56441ef19 +DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96 +EBUILD musescore-3.4.2.ebuild 2694 BLAKE2B bbf84f8e968b06244776d6484b7b02a63c6561724f4acfc197003bbdd889cf71efb69a30aae57616132e8e63328dc2d4bd6070c001a99e5fc173ae53eb962b7a SHA512 0f3b2c6ac8146479ddd1f8890505ea797efe4e5fcd7ceb200f2fa59d4377f0ad5d90df6f6001970dd328c8489a2ec259a0ea3e40179134ac96f536553a4beca1 +EBUILD musescore-3.5.ebuild 3003 BLAKE2B c9d533992a7736df783760a9a5e5b5f3587e6dd21ecbc37a9866c19d20b86b75cadbe34917b6e623b358ccf4998dc77992a00a3f27f242db986ed3256b58b98f SHA512 9c9b94001c01a7d4069e219f2d12a2f802ede0ee52603001712e1746babddee6fb7ae3f7a6d7a96a65c5040e089e46352dc366660d295bf0dcf2cc55d9dc5d51 +EBUILD musescore-9999.ebuild 2948 BLAKE2B e4fe6270fbdbcad61e86b011e64fe952415afcef2d2a4f179585fb660e90d3638fab082ddd52a6a19845d643025e7e180ba10ce0aba9daf2d57a5400cd496fd8 SHA512 bb7051721a7847a679fded90f2debf619d34bf26d4c12cb8782f539887f0eb7ef1ed7f781604945d3a2d334de920804832f3c4e34e311d1f45de9ca44175fc61 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch new file mode 100644 index 000000000000..283ffdc92e21 --- /dev/null +++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch @@ -0,0 +1,13 @@ +diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp +index 94b1aef..6a7b4e8 100644 +--- a/mscore/scoreview.cpp ++++ b/mscore/scoreview.cpp +@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s) + cv->updateGrips(); + }}, + #ifdef OMR +- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) { ++ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) { + if (cv->score()->masterScore()->omr()) + showOmr(!_score->masterScore()->showOmr()); + }}, diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch new file mode 100644 index 000000000000..b4e1ad0baf54 --- /dev/null +++ b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch @@ -0,0 +1,12 @@ +diff --git a/omr/pattern.h b/omr/pattern.h +index b040497..1b8e0c4 100644 +--- a/omr/pattern.h ++++ b/omr/pattern.h +@@ -24,7 +24,6 @@ + + namespace Ms { + +-enum class SymId; + class Sym; + + //--------------------------------------------------------- diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild index cadf43ff2d63..b151f2bf5ca4 100644 --- a/media-sound/musescore/musescore-3.4.2.ebuild +++ b/media-sound/musescore/musescore-3.4.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" REQUIRED_USE="portmidi? ( portaudio )" diff --git a/media-sound/musescore/musescore-3.5.ebuild b/media-sound/musescore/musescore-3.5.ebuild new file mode 100644 index 000000000000..d56a9bca7929 --- /dev/null +++ b/media-sound/musescore/musescore-3.5.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +CHECKREQS_DISK_BUILD=3500M +inherit cmake xdg check-reqs + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +else + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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" +KEYWORDS="" +IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" +REQUIRED_USE="portmidi? ( portaudio )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtquickcontrols2:5 + >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] + dev-qt/qtsvg:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + >=media-libs/freetype-2.5.2 + media-libs/libsndfile + 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-sound/pulseaudio ) + sf3? ( media-libs/libvorbis ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.1-man-pages.patch" + "${FILESDIR}/${P}-lambda-capture-this.patch" + "${FILESDIR}/${P}-remove-duplicite-declaration.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 "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" +} + +src_configure() { + local mycmakeargs=( + -DAEOLUS=OFF # does not compile + -DBUILD_ALSA="$(usex alsa)" + -DBUILD_CRASH_REPORTER=OFF + -DBUILD_JACK="$(usex jack)" + -DBUILD_LAME="$(usex mp3)" + -DBUILD_PCH=ON + -DBUILD_PORTAUDIO="$(usex portaudio)" + -DBUILD_PORTMIDI="$(usex portmidi)" + -DBUILD_PULSEAUDIO="$(usex pulseaudio)" + -DBUILD_SHARED_LIBS=ON + -DBUILD_TELEMETRY_MODULE=ON + -DBUILD_WEBENGINE="$(usex webengine)" + -DCMAKE_SKIP_RPATH=ON + -DDOWNLOAD_SOUNDFONT=OFF + -DHAS_AUDIOFILE=ON + -DOCR=OFF + -DOMR="$(usex omr)" + -DSOUNDFONT3=ON + -DZERBERUS="$(usex sfz)" + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON + -DUSE_SYSTEM_FREETYPE=ON + -DUSE_SYSTEM_POPPLER=ON + -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON + ) + cmake_src_configure +} + +src_compile() { + cd "${BUILD_DIR}" || die + cmake_build -j1 lrelease manpages + cmake_src_compile +} diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index d6ea4938d868..51e4cf8aa99c 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -5,14 +5,21 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit git-r3 cmake xdg check-reqs +inherit cmake xdg check-reqs + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +else + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/MuseScore-${PV}" +fi DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/" -# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ +# 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.1.8.tar.bz2" -EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -59,8 +66,12 @@ PATCHES=( ) src_unpack() { - git-r3_src_unpack - unpack ${A} + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + unpack ${A} + else + default + fi } src_prepare() { |