commit: df386036ecd943a2e350feb082f9aa48216cfa93 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 2 06:19:46 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 2 06:19:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df386036
media-sound/mpd: backport ffmpeg-6.1 fix Closes: https://bugs.gentoo.org/918421 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch | 14 ++++++++++++++ media-sound/mpd/mpd-0.23.13.ebuild | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch b/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch new file mode 100644 index 000000000000..e9515c632c7c --- /dev/null +++ b/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/918421 +https://github.com/MusicPlayerDaemon/MPD/issues/1898 +--- a/src/decoder/plugins/FfmpegIo.cxx ++++ b/src/decoder/plugins/FfmpegIo.cxx +@@ -26,6 +26,9 @@ + + extern "C" { + #include <libavutil/mem.h> ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100) ++#include <libavutil/error.h> ++#endif + } + + AvioStream::~AvioStream() diff --git a/media-sound/mpd/mpd-0.23.13.ebuild b/media-sound/mpd/mpd-0.23.13.ebuild index e38ad01f1d90..05da9e403a93 100644 --- a/media-sound/mpd/mpd-0.23.13.ebuild +++ b/media-sound/mpd/mpd-0.23.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -118,6 +118,10 @@ DEPEND="${RDEPEND} BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-0.23.13-ffmpeg-6.1.patch +) + pkg_setup() { if use eventfd; then CONFIG_CHECK+=" ~EVENTFD"
