commit: 45b3da060bb643f874b33fde315fe92dfe7a1cd0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Sep 27 17:01:44 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 27 17:03:05 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=45b3da06
kde-plasma/kpipewire: Restrict ffmpeg8 patch to >=media-video/ffmpeg-5 Rather than needlessly revbump and raise minimum version, just make it conditional. See also: https://invent.kde.org/plasma/kpipewire/-/merge_requests/208#note_1310965 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ipewire-6.4.90-ffmpeg8.patch => kpipewire-6.4.5-ffmpeg8.patch} | 2 +- kde-plasma/kpipewire/kpipewire-6.4.90.ebuild | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kde-plasma/kpipewire/files/kpipewire-6.4.90-ffmpeg8.patch b/kde-plasma/kpipewire/files/kpipewire-6.4.5-ffmpeg8.patch similarity index 98% rename from kde-plasma/kpipewire/files/kpipewire-6.4.90-ffmpeg8.patch rename to kde-plasma/kpipewire/files/kpipewire-6.4.5-ffmpeg8.patch index 4d1e9439f1..8c721c47ac 100644 --- a/kde-plasma/kpipewire/files/kpipewire-6.4.90-ffmpeg8.patch +++ b/kde-plasma/kpipewire/files/kpipewire-6.4.5-ffmpeg8.patch @@ -1,4 +1,4 @@ -From e2b4a63b3ceb0584f9d4612865920a3dbc9ea512 Mon Sep 17 00:00:00 2001 +From 6dc69b0674f9946641e88151c209ce58f085d06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <[email protected]> Date: Wed, 27 Aug 2025 16:39:36 +0200 Subject: [PATCH] Fix build with ffmpeg >= 8.0 diff --git a/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild b/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild index 066f0702f6..4b5cd3c994 100644 --- a/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild +++ b/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild @@ -44,4 +44,10 @@ RDEPEND="${COMMON_DEPEND} BDEPEND="test? ( >=dev-qt/qtbase-${QTMIN}:6[wayland] )" BDEPEND+=" test? ( || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 ) )" -PATCHES=( "${FILESDIR}/${P}-ffmpeg8.patch" ) +src_prepare() { + # https://invent.kde.org/plasma/kpipewire/-/merge_requests/208#note_1310965 + if has_version ">=media-video/ffmpeg-5"; then + PATCHES+=( "${FILESDIR}/${PN}-6.4.5-ffmpeg8.patch" ) + fi + cmake_src_prepare +}
