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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CEB5138350 for ; Sat, 1 Feb 2020 10:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CF4DE0863; Sat, 1 Feb 2020 10:41:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AA71E0863 for ; Sat, 1 Feb 2020 10:41:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC42C34E4C4 for ; Sat, 1 Feb 2020 10:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57A7A90 for ; Sat, 1 Feb 2020 10:41:37 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1580553691.1a2fd37eedb243cf3235a7b7b64242d680f0b3fa.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/Manifest media-sound/musescore/metadata.xml media-sound/musescore/musescore-3.4.1.ebuild media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 1a2fd37eedb243cf3235a7b7b64242d680f0b3fa X-VCS-Branch: master Date: Sat, 1 Feb 2020 10:41:37 +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: 15057b6c-43bd-4271-8222-c998026fdfb8 X-Archives-Hash: aec9b80ccf2ffcdb397f08fb86148f43 commit: 1a2fd37eedb243cf3235a7b7b64242d680f0b3fa Author: Miroslav Šulc gentoo org> AuthorDate: Sat Feb 1 10:41:14 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Feb 1 10:41:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2fd37e media-sound/musescore: 3.4.1 bump + 9999 sync 1) updated use flags (added osc, omr, sfz, vorbis changed to +sf3) 2) sorted and added config args Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/musescore/Manifest | 1 + media-sound/musescore/metadata.xml | 5 ++- ...usescore-9999.ebuild => musescore-3.4.1.ebuild} | 40 +++++++++++++--------- media-sound/musescore/musescore-9999.ebuild | 27 ++++++++++----- 4 files changed, 48 insertions(+), 25 deletions(-) diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 609f0dccd45..eeefb7ac66b 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -2,3 +2,4 @@ DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea +DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861 diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml index f0d90452cf3..0a529296792 100644 --- a/media-sound/musescore/metadata.xml +++ b/media-sound/musescore/metadata.xml @@ -10,8 +10,11 @@ musescore/MuseScore + Enable OSC remote control protocol + Enable PDF import (OMR - optical music recognition) Enable support for building against media-libs/portmidi - Enable SoundFont support using media-libs/libvorbis + Enable SoundFont 3 support using media-libs/libvorbis + Enable experimental SFZ sampler Use dev-qt/qtwebengine for embedded web browser diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-3.4.1.ebuild similarity index 75% copy from media-sound/musescore/musescore-9999.ebuild copy to media-sound/musescore/musescore-3.4.1.ebuild index 5d3ba673cd3..fb4ff90af18 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-3.4.1.ebuild @@ -5,19 +5,19 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit git-r3 cmake xdg check-reqs +inherit cmake xdg check-reqs 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/ # 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://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" REQUIRED_USE="portmidi? ( portaudio )" BDEPEND=" @@ -44,10 +44,11 @@ DEPEND=" 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 ) - vorbis? ( media-libs/libvorbis ) + sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) " RDEPEND="${DEPEND}" @@ -56,10 +57,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.0.1-man-pages.patch" ) -src_unpack() { - git-r3_src_unpack - unpack ${A} -} +S="${WORKDIR}/MuseScore-${PV}" src_prepare() { cmake_src_prepare @@ -70,19 +68,29 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DDOWNLOAD_SOUNDFONT=OFF - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON - -DUSE_SYSTEM_FREETYPE=ON + -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)" - -DSOUNDFONT3="$(usex vorbis)" + -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 } diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 5d3ba673cd3..6157b14ce4a 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -17,7 +17,7 @@ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" +IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" REQUIRED_USE="portmidi? ( portaudio )" BDEPEND=" @@ -44,10 +44,11 @@ DEPEND=" 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 ) - vorbis? ( media-libs/libvorbis ) + sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) " RDEPEND="${DEPEND}" @@ -70,19 +71,29 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DDOWNLOAD_SOUNDFONT=OFF - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON - -DUSE_SYSTEM_FREETYPE=ON + -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)" - -DSOUNDFONT3="$(usex vorbis)" + -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 }