summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2024-10-29 13:36:36 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2024-10-29 13:36:52 +0100
commitf672994ad029e2ebc9c62048f8e39212e93255b6 (patch)
treea26e2f839f61a6a59a1fa809b5786a2790f1731d /media-sound
parentapp-doc/devmanual: Drop patch for eclass placeholder (diff)
downloadgentoo-f672994ad029e2ebc9c62048f8e39212e93255b6.tar.gz
gentoo-f672994ad029e2ebc9c62048f8e39212e93255b6.tar.bz2
gentoo-f672994ad029e2ebc9c62048f8e39212e93255b6.zip
media-sound/musescore: updated live
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch26
-rw-r--r--media-sound/musescore/musescore-9999.ebuild2
2 files changed, 27 insertions, 1 deletions
diff --git a/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch
new file mode 100644
index 000000000000..3321b4fc34ad
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.5.0-unbundle-deps.patch
@@ -0,0 +1,26 @@
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -242,10 +242,10 @@ if (MUSE_MODULE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/lame lame EXCLUDE_FROM_ALL)
++ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+ set(MODULE_LINK
+ ${MODULE_LINK}
+- lame
++ PkgConfig::lame
+ )
+
+ include(cmake/SetupOpusEnc.cmake)
+--- 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"
+
+ #include "log.h"
+
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 453e2ca9139c..5c0787665552 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -59,7 +59,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
- "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
+ "${FILESDIR}/${PN}-4.5.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
)