From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
Date: Sat, 10 Aug 2024 07:52:33 +0000 (UTC) [thread overview]
Message-ID: <1723276349.792e62986c7be8a0a683cd76a3f5048f723b8d4b.fordfrog@gentoo> (raw)
commit: 792e62986c7be8a0a683cd76a3f5048f723b8d4b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 07:52:09 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:52:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792e6298
media-sound/musescore: updated live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-4.4.0-unbundle-harfbuzz.patch | 25 ++++++++++++++++++++++
media-sound/musescore/musescore-9999.ebuild | 19 ++++++++++------
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
new file mode 100644
index 000000000000..b9a1247a78c1
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
@@ -0,0 +1,25 @@
+--- a/src/framework/draw/CMakeLists.txt
++++ b/src/framework/draw/CMakeLists.txt
+@@ -123,20 +123,14 @@ else()
+ include(${local_path}/harfbuzz.cmake)
+
+ # func from ${name}.cmake)
+- cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "")
+
+- add_subdirectory(_deps/harfbuzz/harfbuzz)
+- target_no_warning(harfbuzz -Wno-conversion)
+- target_no_warning(harfbuzz -Wno-unused-parameter)
+- target_no_warning(harfbuzz -Wno-unused-variable)
+- target_no_warning(harfbuzz -WMSVC-no-hides-previous)
+- target_no_warning(harfbuzz -WMSVC-no-unreachable)
++ pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
+
+ #add_subdirectory(thirdparty/msdfgen)
+
+ set(MODULE_INCLUDE
+ ${FREETYPE_INCLUDE_DIRS}
+- ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
++ /usr/include/harfbuzz
+ #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
+ )
+
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 5e65d317f42e..06e97196028f 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -59,6 +59,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
+ "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
)
@@ -86,13 +87,11 @@ src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
local mycmakeargs=(
+ -DCMAKE_BUILD_TYPE="release"
-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_FLAC=ON
@@ -100,15 +99,23 @@ src_configure() {
-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
- -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
- -DMUSESCORE_BUILD_MODE=release
+ -DMUSE_APP_BUILD_MODE="release"
+ -DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
+ -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
+ # tests
+ -DMUE_BUILD_BRAILLE_TESTS="$(usex test)"
+ -DMUE_BUILD_ENGRAVING_TESTS="$(usex test)"
+ -DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)"
+ -DMUE_BUILD_NOTATION_TESTS="$(usex test)"
+ -DMUE_BUILD_PLAYBACK_TESTS="$(usex test)"
+ -DMUE_BUILD_PROJECT_TESTS="$(usex test)"
)
cmake_src_configure
}
src_compile() {
cd "${BUILD_DIR}" || die
- cmake_build lrelease manpages
+ cmake_build
cmake_src_compile
}
next reply other threads:[~2024-08-10 7:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-10 7:52 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-07 19:29 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ Miroslav Šulc
2024-11-23 17:43 Andreas Sturmlechner
2024-10-15 7:32 Miroslav Šulc
2024-09-06 9:03 Miroslav Šulc
2024-08-04 11:16 Miroslav Šulc
2024-08-04 9:41 Miroslav Šulc
2024-02-09 8:08 Miroslav Šulc
2024-02-06 19:47 Jason A. Donenfeld
2024-01-21 0:56 Jason A. Donenfeld
2023-06-06 6:45 Miroslav Šulc
2023-01-09 13:02 Sam James
2021-03-02 8:54 Miroslav Šulc
2020-12-11 10:10 Miroslav Šulc
2020-10-17 8:09 Miroslav Šulc
2019-11-28 20:00 Miroslav Šulc
2019-02-02 21:40 Miroslav Šulc
2019-02-01 21:21 Miroslav Šulc
2018-08-21 21:36 Andreas Sturmlechner
2017-01-30 13:20 Johannes Huber
2017-01-30 13:20 Johannes Huber
2016-02-01 21:41 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1723276349.792e62986c7be8a0a683cd76a3f5048f723b8d4b.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox