| 1 |
commit: 1a2fd37eedb243cf3235a7b7b64242d680f0b3fa |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 10:41:14 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 10:41:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2fd37e |
| 7 |
|
| 8 |
media-sound/musescore: 3.4.1 bump + 9999 sync |
| 9 |
|
| 10 |
1) updated use flags (added osc, omr, sfz, vorbis changed to +sf3) |
| 11 |
2) sorted and added config args |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 15 |
|
| 16 |
media-sound/musescore/Manifest | 1 + |
| 17 |
media-sound/musescore/metadata.xml | 5 ++- |
| 18 |
...usescore-9999.ebuild => musescore-3.4.1.ebuild} | 40 +++++++++++++--------- |
| 19 |
media-sound/musescore/musescore-9999.ebuild | 27 ++++++++++----- |
| 20 |
4 files changed, 48 insertions(+), 25 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest |
| 23 |
index 609f0dccd45..eeefb7ac66b 100644 |
| 24 |
--- a/media-sound/musescore/Manifest |
| 25 |
+++ b/media-sound/musescore/Manifest |
| 26 |
@@ -2,3 +2,4 @@ DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728 |
| 27 |
DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9 |
| 28 |
DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082 |
| 29 |
DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea |
| 30 |
+DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861 |
| 31 |
|
| 32 |
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml |
| 33 |
index f0d90452cf3..0a529296792 100644 |
| 34 |
--- a/media-sound/musescore/metadata.xml |
| 35 |
+++ b/media-sound/musescore/metadata.xml |
| 36 |
@@ -10,8 +10,11 @@ |
| 37 |
<remote-id type="github">musescore/MuseScore</remote-id> |
| 38 |
</upstream> |
| 39 |
<use> |
| 40 |
+ <flag name="osc">Enable OSC remote control protocol</flag> |
| 41 |
+ <flag name="omr">Enable PDF import (OMR - optical music recognition)</flag> |
| 42 |
<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag> |
| 43 |
- <flag name="vorbis">Enable SoundFont support using <pkg>media-libs/libvorbis</pkg></flag> |
| 44 |
+ <flag name="sf3">Enable SoundFont 3 support using <pkg>media-libs/libvorbis</pkg></flag> |
| 45 |
+ <flag name="sfz">Enable experimental SFZ sampler</flag> |
| 46 |
<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag> |
| 47 |
</use> |
| 48 |
</pkgmetadata> |
| 49 |
|
| 50 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-3.4.1.ebuild |
| 51 |
similarity index 75% |
| 52 |
copy from media-sound/musescore/musescore-9999.ebuild |
| 53 |
copy to media-sound/musescore/musescore-3.4.1.ebuild |
| 54 |
index 5d3ba673cd3..fb4ff90af18 100644 |
| 55 |
--- a/media-sound/musescore/musescore-9999.ebuild |
| 56 |
+++ b/media-sound/musescore/musescore-3.4.1.ebuild |
| 57 |
@@ -5,19 +5,19 @@ EAPI=7 |
| 58 |
|
| 59 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 60 |
CHECKREQS_DISK_BUILD=3500M |
| 61 |
-inherit git-r3 cmake xdg check-reqs |
| 62 |
+inherit cmake xdg check-reqs |
| 63 |
|
| 64 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
| 65 |
HOMEPAGE="https://musescore.org/" |
| 66 |
# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ |
| 67 |
# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there. |
| 68 |
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2" |
| 69 |
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" |
| 70 |
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 71 |
+ https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2" |
| 72 |
|
| 73 |
LICENSE="GPL-2" |
| 74 |
SLOT="0" |
| 75 |
-KEYWORDS="" |
| 76 |
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" |
| 77 |
+KEYWORDS="~amd64 ~x86" |
| 78 |
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" |
| 79 |
REQUIRED_USE="portmidi? ( portaudio )" |
| 80 |
|
| 81 |
BDEPEND=" |
| 82 |
@@ -44,10 +44,11 @@ DEPEND=" |
| 83 |
alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
| 84 |
jack? ( virtual/jack ) |
| 85 |
mp3? ( media-sound/lame ) |
| 86 |
+ omr? ( app-text/poppler ) |
| 87 |
portaudio? ( media-libs/portaudio ) |
| 88 |
portmidi? ( media-libs/portmidi ) |
| 89 |
pulseaudio? ( media-sound/pulseaudio ) |
| 90 |
- vorbis? ( media-libs/libvorbis ) |
| 91 |
+ sf3? ( media-libs/libvorbis ) |
| 92 |
webengine? ( dev-qt/qtwebengine:5[widgets] ) |
| 93 |
" |
| 94 |
RDEPEND="${DEPEND}" |
| 95 |
@@ -56,10 +57,7 @@ PATCHES=( |
| 96 |
"${FILESDIR}/${PN}-3.0.1-man-pages.patch" |
| 97 |
) |
| 98 |
|
| 99 |
-src_unpack() { |
| 100 |
- git-r3_src_unpack |
| 101 |
- unpack ${A} |
| 102 |
-} |
| 103 |
+S="${WORKDIR}/MuseScore-${PV}" |
| 104 |
|
| 105 |
src_prepare() { |
| 106 |
cmake_src_prepare |
| 107 |
@@ -70,19 +68,29 @@ src_prepare() { |
| 108 |
|
| 109 |
src_configure() { |
| 110 |
local mycmakeargs=( |
| 111 |
- -DCMAKE_SKIP_RPATH=ON |
| 112 |
- -DDOWNLOAD_SOUNDFONT=OFF |
| 113 |
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON |
| 114 |
- -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON |
| 115 |
- -DUSE_SYSTEM_FREETYPE=ON |
| 116 |
+ -DAEOLUS=OFF # does not compile |
| 117 |
-DBUILD_ALSA="$(usex alsa)" |
| 118 |
+ -DBUILD_CRASH_REPORTER=OFF |
| 119 |
-DBUILD_JACK="$(usex jack)" |
| 120 |
-DBUILD_LAME="$(usex mp3)" |
| 121 |
+ -DBUILD_PCH=ON |
| 122 |
-DBUILD_PORTAUDIO="$(usex portaudio)" |
| 123 |
-DBUILD_PORTMIDI="$(usex portmidi)" |
| 124 |
-DBUILD_PULSEAUDIO="$(usex pulseaudio)" |
| 125 |
- -DSOUNDFONT3="$(usex vorbis)" |
| 126 |
+ -DBUILD_SHARED_LIBS=ON |
| 127 |
+ -DBUILD_TELEMETRY_MODULE=ON |
| 128 |
-DBUILD_WEBENGINE="$(usex webengine)" |
| 129 |
+ -DCMAKE_SKIP_RPATH=ON |
| 130 |
+ -DDOWNLOAD_SOUNDFONT=OFF |
| 131 |
+ -DHAS_AUDIOFILE=ON |
| 132 |
+ -DOCR=OFF |
| 133 |
+ -DOMR="$(usex omr)" |
| 134 |
+ -DSOUNDFONT3=ON |
| 135 |
+ -DZERBERUS="$(usex sfz)" |
| 136 |
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON |
| 137 |
+ -DUSE_SYSTEM_FREETYPE=ON |
| 138 |
+ -DUSE_SYSTEM_POPPLER=ON |
| 139 |
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON |
| 140 |
) |
| 141 |
cmake_src_configure |
| 142 |
} |
| 143 |
|
| 144 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild |
| 145 |
index 5d3ba673cd3..6157b14ce4a 100644 |
| 146 |
--- a/media-sound/musescore/musescore-9999.ebuild |
| 147 |
+++ b/media-sound/musescore/musescore-9999.ebuild |
| 148 |
@@ -17,7 +17,7 @@ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" |
| 149 |
LICENSE="GPL-2" |
| 150 |
SLOT="0" |
| 151 |
KEYWORDS="" |
| 152 |
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" |
| 153 |
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" |
| 154 |
REQUIRED_USE="portmidi? ( portaudio )" |
| 155 |
|
| 156 |
BDEPEND=" |
| 157 |
@@ -44,10 +44,11 @@ DEPEND=" |
| 158 |
alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
| 159 |
jack? ( virtual/jack ) |
| 160 |
mp3? ( media-sound/lame ) |
| 161 |
+ omr? ( app-text/poppler ) |
| 162 |
portaudio? ( media-libs/portaudio ) |
| 163 |
portmidi? ( media-libs/portmidi ) |
| 164 |
pulseaudio? ( media-sound/pulseaudio ) |
| 165 |
- vorbis? ( media-libs/libvorbis ) |
| 166 |
+ sf3? ( media-libs/libvorbis ) |
| 167 |
webengine? ( dev-qt/qtwebengine:5[widgets] ) |
| 168 |
" |
| 169 |
RDEPEND="${DEPEND}" |
| 170 |
@@ -70,19 +71,29 @@ src_prepare() { |
| 171 |
|
| 172 |
src_configure() { |
| 173 |
local mycmakeargs=( |
| 174 |
- -DCMAKE_SKIP_RPATH=ON |
| 175 |
- -DDOWNLOAD_SOUNDFONT=OFF |
| 176 |
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON |
| 177 |
- -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON |
| 178 |
- -DUSE_SYSTEM_FREETYPE=ON |
| 179 |
+ -DAEOLUS=OFF # does not compile |
| 180 |
-DBUILD_ALSA="$(usex alsa)" |
| 181 |
+ -DBUILD_CRASH_REPORTER=OFF |
| 182 |
-DBUILD_JACK="$(usex jack)" |
| 183 |
-DBUILD_LAME="$(usex mp3)" |
| 184 |
+ -DBUILD_PCH=ON |
| 185 |
-DBUILD_PORTAUDIO="$(usex portaudio)" |
| 186 |
-DBUILD_PORTMIDI="$(usex portmidi)" |
| 187 |
-DBUILD_PULSEAUDIO="$(usex pulseaudio)" |
| 188 |
- -DSOUNDFONT3="$(usex vorbis)" |
| 189 |
+ -DBUILD_SHARED_LIBS=ON |
| 190 |
+ -DBUILD_TELEMETRY_MODULE=ON |
| 191 |
-DBUILD_WEBENGINE="$(usex webengine)" |
| 192 |
+ -DCMAKE_SKIP_RPATH=ON |
| 193 |
+ -DDOWNLOAD_SOUNDFONT=OFF |
| 194 |
+ -DHAS_AUDIOFILE=ON |
| 195 |
+ -DOCR=OFF |
| 196 |
+ -DOMR="$(usex omr)" |
| 197 |
+ -DSOUNDFONT3=ON |
| 198 |
+ -DZERBERUS="$(usex sfz)" |
| 199 |
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON |
| 200 |
+ -DUSE_SYSTEM_FREETYPE=ON |
| 201 |
+ -DUSE_SYSTEM_POPPLER=ON |
| 202 |
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON |
| 203 |
) |
| 204 |
cmake_src_configure |
| 205 |
} |
Archives