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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F6D715815E for ; Fri, 9 Feb 2024 08:08:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6494E29C9; Fri, 9 Feb 2024 08:08:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B10A2E29C9 for ; Fri, 9 Feb 2024 08:08:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F193343086 for ; Fri, 9 Feb 2024 08:08:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D3B214C6 for ; Fri, 9 Feb 2024 08:08:15 +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: <1707466092.5aaa8f5287fef487d369c16d897e0171d01af00b.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/files/musescore-9999-unbundle-deps.patch media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/files/ media-sound/musescore/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 5aaa8f5287fef487d369c16d897e0171d01af00b X-VCS-Branch: master Date: Fri, 9 Feb 2024 08:08:15 +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: 608eb495-dcaf-4dd9-b457-96e6c8c687a1 X-Archives-Hash: 66885c54859eec86cd5823c3f5aece79 commit: 5aaa8f5287fef487d369c16d897e0171d01af00b Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 9 08:08:01 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 9 08:08:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aaa8f52 media-sound/musescore: updated live ebuild patches Signed-off-by: Miroslav Šulc gentoo.org> .../files/musescore-9999-unbundle-deps.patch | 120 +++++++++++++++++++++ media-sound/musescore/musescore-9999.ebuild | 3 +- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch new file mode 100644 index 000000000000..bac09d7eaa82 --- /dev/null +++ b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch @@ -0,0 +1,120 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,7 +206,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 +@@ -112,9 +112,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}/thirdparty/tinyxml/mu_patch.h + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h + ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp +@@ -132,6 +129,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() +@@ -213,6 +212,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 + + #include "log.h" + +--- a/src/framework/global/serialization/xmlstreamreader.cpp ++++ b/src/framework/global/serialization/xmlstreamreader.cpp +@@ -25,7 +25,7 @@ + + #include "global/types/string.h" + +-#include "thirdparty/tinyxml/tinyxml2.h" ++#include + + #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/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 09adc4123499..5ea71c947e32 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -70,9 +70,8 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch" - "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch" + "${FILESDIR}/${PN}-9999-unbundle-deps.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" - "${FILESDIR}/${PN}-4.2.1-missing-headers.patch" ) src_unpack() {