summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2025-01-09 09:35:00 -0800
committerArmin Kuster <akuster808@gmail.com>2025-02-04 14:29:37 -0800
commit50c517808c0b2d78e8c62f352bb012f2febc1674 (patch)
treefefa57c0425112025855522b4c7c4fd762062e3b
parent7816f8d0808007c78e23ca75390c87a98b8b6c69 (diff)
downloadmeta-openembedded-50c517808c0b2d78e8c62f352bb012f2febc1674.tar.gz
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> (cherry picked from commit e7ca3cedb0ada5363db24d1ba7256544732173d7) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch52
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb (renamed from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb)3
2 files changed, 1 insertions, 54 deletions
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
deleted file mode 100644
index 8b85f396ca..0000000000
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001
2From: Michael Cho <michael@michaelcho.dev>
3Date: Sat, 26 Oct 2024 10:29:53 -0400
4Subject: [PATCH] meson.build: support building with ICU 76
5
6ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
7add `icu-uc` when linking to shared libraries. This results in failure:
8```
9src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol 'ucnv_fromUnicode_76'
10```
11
12[^1]: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56
13
14Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/1a063fee7ec1077e248ff97ebf1f92c5c5941a67]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/lib/icu/meson.build | 11 +++++++----
18 1 file changed, 7 insertions(+), 4 deletions(-)
19
20diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
21index 3ecc0a517..e6cf8cdce 100644
22--- a/src/lib/icu/meson.build
23+++ b/src/lib/icu/meson.build
24@@ -1,5 +1,7 @@
25-icu_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu'))
26-conf.set('HAVE_ICU', icu_dep.found())
27+icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu'))
28+icu_uc_dep = dependency('icu-uc', version: '>= 50', required: get_option('icu'))
29+have_icu = icu_i18n_dep.found() and icu_uc_dep.found()
30+conf.set('HAVE_ICU', have_icu)
31
32 icu_sources = [
33 'Canonicalize.cxx',
34@@ -13,7 +15,7 @@ if is_windows
35 endif
36
37 iconv_dep = []
38-if icu_dep.found()
39+if have_icu
40 icu_sources += [
41 'Init.cxx',
42 'Util.cxx',
43@@ -31,7 +33,8 @@ icu = static_library(
44 icu_sources,
45 include_directories: inc,
46 dependencies: [
47- icu_dep,
48+ icu_i18n_dep,
49+ icu_uc_dep,
50 iconv_dep,
51 fmt_dep,
52 ],
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb
index 3fa4485a04..4d854d6fc5 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb
@@ -21,9 +21,8 @@ DEPENDS += " \
21PV .= "+git" 21PV .= "+git"
22SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ 22SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \
23 file://mpd.conf.in \ 23 file://mpd.conf.in \
24 file://0001-meson.build-support-building-with-ICU-76.patch \
25 " 24 "
26SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" 25SRCREV = "b5bd294e5c88c062b1a9c0c4c60397fbf7f3f1c5"
27S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
28 27
29EXTRA_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)} \ 28EXTRA_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)} \