diff mbox series

[meta-multimedia,PATCHv2] musicpd: unbreak build with ffmpeg 6.1

Message ID 20231120174725.2758863-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-multimedia,PATCHv2] musicpd: unbreak build with ffmpeg 6.1 | expand

Commit Message

Markus Volk Nov. 20, 2023, 5:47 p.m. UTC
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...tch-src_decoder_plugins_FfmpegIo.cxx.patch | 26 +++++++++++++++++++
 .../recipes-multimedia/musicpd/mpd_0.23.14.bb |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch

Comments

Khem Raj Nov. 21, 2023, 8:46 p.m. UTC | #1
On Mon, 20 Nov 2023 18:47:25 +0100, Markus Volk wrote:
> 


Applied, thanks!

[1/1] musicpd: unbreak build with ffmpeg 6.1
      commit: 1e086c487d4e68ec011479884de17d3503d64f76

Best regards,
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
new file mode 100644
index 000000000..b2dea331e
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
@@ -0,0 +1,26 @@ 
+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.14.bb
index 310b5f7c3..a762fc832 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
@@ -19,6 +19,7 @@  DEPENDS += " \
 "
 
 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"