mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
mpd: Upgrade mpd to 0.23.16
- Release Notes * database - fix integer overflows with 64-bit inode numbers * filter - ffmpeg: fix for filters producing no output * support libfmt 11 * support ICU 76 - Drop ICU-76 support patch its already in this release Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
938d1803cd
commit
e7ca3cedb0
|
|
@ -1,52 +0,0 @@
|
|||
From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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,
|
||||
],
|
||||
|
|
@ -21,9 +21,8 @@ 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"
|
||||
SRCREV = "b5bd294e5c88c062b1a9c0c4c60397fbf7f3f1c5"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
|
||||
Loading…
Reference in New Issue
Block a user