diff mbox series

[meta-multimedia,8/8] mpd: Upgrade to 0.23.15+git

Message ID 20240830035827.406391-8-raj.khem@gmail.com
State New
Headers show
Series [meta-filesystems,1/8] e2tools: Fix build with automake 1.17 | expand

Commit Message

Khem Raj Aug. 30, 2024, 3:58 a.m. UTC 
Drop uneeded patch

ver 0.23.15 (2023/12/20)
* decoder
  - ffmpeg: fix build failure with FFmpeg 6.1
* output
  - alsa: limit buffer time to 2 seconds

Use latest master for fmt 11.x fixes

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...tch-src_decoder_plugins_FfmpegIo.cxx.patch | 26 -------------------
 .../{mpd_0.23.14.bb => mpd_0.23.15.bb}        | 11 +++++---
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
 rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.23.14.bb => mpd_0.23.15.bb} (96%)
diff mbox series

Patch

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
deleted file mode 100644
index b2dea331ef..0000000000
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 20 Nov 2023 17:49:59 +0100
-Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898]
----
- src/decoder/plugins/FfmpegIo.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
-index 572f1a86a..3e2347fec 100644
---- a/src/decoder/plugins/FfmpegIo.cxx
-+++ b/src/decoder/plugins/FfmpegIo.cxx
-@@ -25,6 +25,7 @@
- #include "input/InputStream.hxx"
- 
- extern "C" {
-+#include <libavutil/error.h>
- #include <libavutil/mem.h>
- }
- 
--- 
-2.42.0
-
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb
similarity index 96%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb
index 33155da7d2..f066c405f1 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb
@@ -18,14 +18,19 @@  DEPENDS += " \
     fmt \
 "
 
+PV .= "+git"
 SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \
-           file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \
            file://mpd.conf.in \
            "
-SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773"
+SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3"
 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)}"
+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)} \
+    -Dadplug=disabled \
+    -Dsndio=disabled \
+    -Dshine=disabled \
+    -Dtremor=disabled \
+"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \
                    alsa ao bzip2 daemon \