From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BA2815803E for ; Tue, 2 Jan 2024 06:20:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A63E2BC02B; Tue, 2 Jan 2024 06:20:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 431D92BC02B for ; Tue, 2 Jan 2024 06:20:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3502534068A for ; Tue, 2 Jan 2024 06:20:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B66AAC2 for ; Tue, 2 Jan 2024 06:20:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704176386.df386036ecd943a2e350feb082f9aa48216cfa93.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/, media-sound/mpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch media-sound/mpd/mpd-0.23.13.ebuild X-VCS-Directories: media-sound/mpd/files/ media-sound/mpd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: df386036ecd943a2e350feb082f9aa48216cfa93 X-VCS-Branch: master Date: Tue, 2 Jan 2024 06:20:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e5b2d7f-c762-401b-9f56-f014682fcbbe X-Archives-Hash: 82f728b7fc8646f19c0f9c3421e8a79e commit: df386036ecd943a2e350feb082f9aa48216cfa93 Author: Sam James gentoo org> AuthorDate: Tue Jan 2 06:19:46 2024 +0000 Commit: Sam James gentoo 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 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 ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100) ++#include ++#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"