commit: 79e1d8024e0c4da90c68a43fc09395663426741f Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sun Aug 4 11:24:30 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Aug 4 11:24:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e1d802
media-sound/musescore: dropped obsolete 4.2.1-r2 Bug: https://bugs.gentoo.org/937234 Closes: https://bugs.gentoo.org/927888 Bug: https://bugs.gentoo.org/926328 Bug: https://bugs.gentoo.org/923217 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/musescore/Manifest | 1 - .../files/musescore-4.2.0-unbundle-deps.patch | 119 ------------------ media-sound/musescore/metadata.xml | 1 - media-sound/musescore/musescore-4.2.1-r2.ebuild | 140 --------------------- 4 files changed, 261 deletions(-) diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 3175279d6972..0c1a8f18e1b7 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,4 +1,3 @@ DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e -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.2.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch deleted file mode 100644 index 50b388814680..000000000000 --- a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,7 +185,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,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT) - ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h - ) - -- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame) -- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc) -- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac) -+ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame) -+ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc) -+ pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac) -+ pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++) - -- set(MODULE_LINK ${MODULE_LINK} lame opusenc flac) -+ set(MODULE_LINK -+ ${MODULE_LINK} -+ PkgConfig::lame -+ PkgConfig::libopusenc -+ PkgConfig::flac -+ PkgConfig::flacpp -+ ) - endif() - - if (ARCH_IS_X86_64) ---- 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/audio/internal/encoders/oggencoder.cpp -+++ b/src/framework/audio/internal/encoders/oggencoder.cpp -@@ -22,7 +22,7 @@ - - #include "oggencoder.h" - --#include "opusenc.h" -+#include "opus/opusenc.h" - - #include "log.h" - ---- a/src/framework/global/CMakeLists.txt -+++ b/src/framework/global/CMakeLists.txt -@@ -111,8 +111,6 @@ set(MODULE_SRC - ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h - ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp - ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h -- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp -- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h - ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp - ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h - ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp -@@ -130,6 +128,8 @@ set(MODULE_SRC - ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h - ) - -+find_package(tinyxml2 REQUIRED) -+ - if (GLOBAL_NO_INTERNAL) - set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL) - else() -@@ -209,6 +209,7 @@ list(APPEND MODULE_INCLUDE - list(APPEND MODULE_LINK - ${FS_LIB} - ${Z_LIB} -+ tinyxml2::tinyxml2 - ) - - if (MUE_ENABLE_CUSTOM_ALLOCATOR) ---- a/src/framework/global/serialization/xmldom.cpp -+++ b/src/framework/global/serialization/xmldom.cpp -@@ -21,7 +21,7 @@ - */ - #include "xmldom.h" - --#include "thirdparty/tinyxml/tinyxml2.h" -+#include <tinyxml2.h> - - #include "log.h" - ---- a/src/framework/global/serialization/xmlstreamreader.cpp -+++ b/src/framework/global/serialization/xmlstreamreader.cpp -@@ -23,7 +23,7 @@ - - #include <cstring> - --#include "thirdparty/tinyxml/tinyxml2.h" -+#include <tinyxml2.h> - - #include "log.h" - ---- 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/metadata.xml b/media-sound/musescore/metadata.xml index bb8981f3fa8a..bdf3cf8fbc6d 100644 --- a/media-sound/musescore/metadata.xml +++ b/media-sound/musescore/metadata.xml @@ -10,7 +10,6 @@ <remote-id type="github">musescore/MuseScore</remote-id> </upstream> <use> - <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag> <flag name="osc">Enable OSC remote control protocol</flag> <flag name="omr">Enable PDF import (OMR - optical music recognition)</flag> <flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag> diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild deleted file mode 100644 index 9e3eb5ad3fc8..000000000000 --- a/media-sound/musescore/musescore-4.2.1-r2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# 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.2.0-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_FREETYPE=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 -}
