From: Khem Raj <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 81a0d778f33fd5716c1c1eb19ffada4b94e1df31) Signed-off-by: Armin Kuster <[email protected]> --- ...n.build-support-building-with-ICU-76.patch | 52 +++++++++++++++++++ .../recipes-multimedia/musicpd/mpd_0.23.15.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch new file mode 100644 index 0000000000..8b85f396ca --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch @@ -0,0 +1,52 @@ +From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001 +From: Michael Cho <[email protected]> +Date: Sat, 26 Oct 2024 10:29:53 -0400 +Subject: [PATCH] meson.build: support building with ICU 76 + +ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer +add `icu-uc` when linking to shared libraries. This results in failure: +``` +src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol 'ucnv_fromUnicode_76' +``` + +[^1]: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 + +Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/1a063fee7ec1077e248ff97ebf1f92c5c5941a67] +Signed-off-by: Khem Raj <[email protected]> +--- + src/lib/icu/meson.build | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build +index 3ecc0a517..e6cf8cdce 100644 +--- a/src/lib/icu/meson.build ++++ b/src/lib/icu/meson.build +@@ -1,5 +1,7 @@ +-icu_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu')) +-conf.set('HAVE_ICU', icu_dep.found()) ++icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu')) ++icu_uc_dep = dependency('icu-uc', version: '>= 50', required: get_option('icu')) ++have_icu = icu_i18n_dep.found() and icu_uc_dep.found() ++conf.set('HAVE_ICU', have_icu) + + icu_sources = [ + 'Canonicalize.cxx', +@@ -13,7 +15,7 @@ if is_windows + endif + + iconv_dep = [] +-if icu_dep.found() ++if have_icu + icu_sources += [ + 'Init.cxx', + 'Util.cxx', +@@ -31,7 +33,8 @@ icu = static_library( + icu_sources, + include_directories: inc, + dependencies: [ +- icu_dep, ++ icu_i18n_dep, ++ icu_uc_dep, + iconv_dep, + fmt_dep, + ], diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb index f066c405f1..3fa4485a04 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb @@ -21,6 +21,7 @@ DEPENDS += " \ PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ file://mpd.conf.in \ + file://0001-meson.build-support-building-with-ICU-76.patch \ " SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" S = "${WORKDIR}/git" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114778): https://lists.openembedded.org/g/openembedded-devel/message/114778 Mute This Topic: https://lists.openembedded.org/mt/110534994/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
