diff options
author | alperak <alperyasinak1@gmail.com> | 2023-11-12 18:54:44 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-11-12 12:18:48 -0800 |
commit | 2afb48b7f6a34dfadcc6038816c712dc022046d0 (patch) | |
tree | 1eec92da8752f26f7c69268576b045676dc1506b /meta-multimedia | |
parent | 9bf89882907845d555406383b603f08d76a4a8ad (diff) | |
download | meta-openembedded-2afb48b7f6a34dfadcc6038816c712dc022046d0.tar.gz |
mpd: upgrade 0.23.12 -> 0.23.14
Patches deleted because issues fixed in the new version.
Changelog:
ver 0.23.14 (2023/10/08)
* decoder
- flac: fix scanning files with non-ASCII names on Windows
- mad: fix calculation of LAME peak values
* mixer
- wasapi: fix problem setting volume
* more libfmt 10 fixes
* fix auto-detected systemd unit directory
* Android
- require Android 7 or newer
ver 0.23.13 (2023/05/22)
* input
- curl: fix busy loop after connection failed
- curl: hide "404" log messages for non-existent ".mpdignore" files
* archive
- zzip: fix crash bug
* database
- simple: reveal hidden songs after deleting containing CUE
* decoder
- ffmpeg: reorder to a lower priority than "gme"
- gme: require GME 0.6 or later
* output
- pipewire: fix corruption bug due to missing lock
* Linux
- shut down if parent process dies in --no-daemon mode
- determine systemd unit directories via pkg-config
* support libfmt 10
Signed-off-by: alperak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch | 28 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch | 71 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch | 27 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb (renamed from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb) | 5 |
4 files changed, 1 insertions, 130 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch deleted file mode 100644 index 37aa448e9..000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f2fbfeeb9c4ff7aa9ba4b95604ee0fb14ecec763 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 May 2023 17:54:09 -0700 | ||
4 | Subject: [PATCH] SndfileDecoderPlugin: Fix type mismatch for std::span | ||
5 | |||
6 | Fixes | ||
7 | ../git/src/decoder/plugins/SndfileDecoderPlugin.cxx:231:25: error: non-constant-expression cannot be narrowed from type 'sf_count_t' (aka 'long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] | ||
8 | std::span{buffer, num_frames * frame_size}, | ||
9 | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/decoder/plugins/SndfileDecoderPlugin.cxx | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx | ||
17 | index ad3908847..a3cb87ca9 100644 | ||
18 | --- a/src/decoder/plugins/SndfileDecoderPlugin.cxx | ||
19 | +++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx | ||
20 | @@ -228,7 +228,7 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is) | ||
21 | break; | ||
22 | |||
23 | cmd = client.SubmitAudio(is, | ||
24 | - std::span{buffer, num_frames * frame_size}, | ||
25 | + std::span{buffer, static_cast<std::size_t>(num_frames * frame_size)}, | ||
26 | 0); | ||
27 | if (cmd == DecoderCommand::SEEK) { | ||
28 | sf_count_t c = client.GetSeekFrame(); | ||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch deleted file mode 100644 index ebbea2b35..000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d] | ||
2 | |||
3 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
4 | |||
5 | From 181b96dd2d71bc8f2668776719d344466f258b5d Mon Sep 17 00:00:00 2001 | ||
6 | From: Max Kellermann <max.kellermann@gmail.com> | ||
7 | Date: Mon, 15 May 2023 20:52:21 +0200 | ||
8 | Subject: [PATCH] command/player, SongPrint: use AudioFormatFormatter() | ||
9 | |||
10 | libfmt version 10 apparently doesn't know how to format a | ||
11 | `StringBuffer`, failing the MPD build. Since we have a formatter | ||
12 | specialization for `AudioFormat`, let's use that - it's better and | ||
13 | easier to use. | ||
14 | |||
15 | Closes https://github.com/MusicPlayerDaemon/MPD/issues/1807 | ||
16 | --- | ||
17 | src/SongPrint.cxx | 5 +++-- | ||
18 | src/command/PlayerCommands.cxx | 3 ++- | ||
19 | 2 files changed, 5 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx | ||
22 | index 98d544cc38..835669d276 100644 | ||
23 | --- a/src/SongPrint.cxx | ||
24 | +++ b/src/SongPrint.cxx | ||
25 | @@ -8,6 +8,7 @@ | ||
26 | #include "TagPrint.hxx" | ||
27 | #include "client/Response.hxx" | ||
28 | #include "fs/Traits.hxx" | ||
29 | +#include "lib/fmt/AudioFormatFormatter.hxx" | ||
30 | #include "time/ChronoUtil.hxx" | ||
31 | #include "util/StringBuffer.hxx" | ||
32 | #include "util/UriUtil.hxx" | ||
33 | @@ -77,7 +78,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept | ||
34 | time_print(r, "Last-Modified", song.mtime); | ||
35 | |||
36 | if (song.audio_format.IsDefined()) | ||
37 | - r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format)); | ||
38 | + r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format); | ||
39 | |||
40 | tag_print_values(r, song.tag); | ||
41 | |||
42 | @@ -100,7 +101,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept | ||
43 | time_print(r, "Last-Modified", song.GetLastModified()); | ||
44 | |||
45 | if (const auto &f = song.GetAudioFormat(); f.IsDefined()) | ||
46 | - r.Fmt(FMT_STRING("Format: {}\n"), ToString(f)); | ||
47 | + r.Fmt(FMT_STRING("Format: {}\n"), f); | ||
48 | |||
49 | tag_print_values(r, song.GetTag()); | ||
50 | |||
51 | diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx | ||
52 | index 5108b9d3c4..0b5a917020 100644 | ||
53 | --- a/src/command/PlayerCommands.cxx | ||
54 | +++ b/src/command/PlayerCommands.cxx | ||
55 | @@ -13,6 +13,7 @@ | ||
56 | #include "Partition.hxx" | ||
57 | #include "Instance.hxx" | ||
58 | #include "IdleFlags.hxx" | ||
59 | +#include "lib/fmt/AudioFormatFormatter.hxx" | ||
60 | #include "util/StringBuffer.hxx" | ||
61 | #include "util/ScopeExit.hxx" | ||
62 | #include "util/Exception.hxx" | ||
63 | @@ -170,7 +171,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r) | ||
64 | |||
65 | if (player_status.audio_format.IsDefined()) | ||
66 | r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"), | ||
67 | - ToString(player_status.audio_format)); | ||
68 | + player_status.audio_format); | ||
69 | } | ||
70 | |||
71 | #ifdef ENABLE_DATABASE | ||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch deleted file mode 100644 index 0c9d97910..000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | [https://github.com/MusicPlayerDaemon/MPD/commit/f869593ac8913e52c711e974257bd6dc0d5dbf26] | ||
3 | |||
4 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
5 | |||
6 | From f869593ac8913e52c711e974257bd6dc0d5dbf26 Mon Sep 17 00:00:00 2001 | ||
7 | From: Max Kellermann <max.kellermann@gmail.com> | ||
8 | Date: Mon, 15 May 2023 20:59:58 +0200 | ||
9 | Subject: [PATCH] TimePrint: minor fixup for libfmt 10 | ||
10 | |||
11 | libfmt version 10 has difficulties formatting a `StringBuffer`, and we | ||
12 | need to help it by explicitly invoking the `c_str()` method. | ||
13 | --- | ||
14 | src/TimePrint.cxx | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx | ||
18 | index 5bf05f6238..d47f3178bb 100644 | ||
19 | --- a/src/TimePrint.cxx | ||
20 | +++ b/src/TimePrint.cxx | ||
21 | @@ -20,5 +20,5 @@ time_print(Response &r, const char *name, | ||
22 | return; | ||
23 | } | ||
24 | |||
25 | - r.Fmt(FMT_STRING("{}: {}\n"), name, s); | ||
26 | + r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str()); | ||
27 | } | ||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb index 0c309ded0..310b5f7c3 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb | |||
@@ -20,11 +20,8 @@ DEPENDS += " \ | |||
20 | 20 | ||
21 | SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ | 21 | SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ |
22 | file://mpd.conf.in \ | 22 | file://mpd.conf.in \ |
23 | file://minor-fixup-for-libfmt10.patch \ | ||
24 | file://fix-build-error-when-fmt-updated.patch \ | ||
25 | file://0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch \ | ||
26 | " | 23 | " |
27 | SRCREV = "b1422fbda40a1831d397fb161e7a555443c2a072" | 24 | SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" |
28 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
29 | 26 | ||
30 | 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)}" | 27 | 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)}" |