[gentoo-commits] proj/kde:master commit in: kde-plasma/kpipewire/

[Andreas Sturmlechner]

commit:     d9857e4250a315ad25dbad94291ab02b7fa636e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 18:50:43 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 18:50:43 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9857e42

kde-plasma/kpipewire: Raise minimum media-video/ffmpeg to 6.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kpipewire/kpipewire-6.4.49.9999.ebuild |  2 +-
 kde-plasma/kpipewire/kpipewire-6.4.90.ebuild      | 10 ++--------
 kde-plasma/kpipewire/kpipewire-6.5.49.9999.ebuild |  2 +-
 kde-plasma/kpipewire/kpipewire-9999.ebuild        |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/kde-plasma/kpipewire/kpipewire-6.4.49.9999.ebuild 
b/kde-plasma/kpipewire/kpipewire-6.4.49.9999.ebuild
index b69d642682..95a78002a8 100644
--- a/kde-plasma/kpipewire/kpipewire-6.4.49.9999.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.4.49.9999.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
        media-libs/libglvnd
        media-libs/libva:=
        media-libs/mesa[opengl]
-       media-video/ffmpeg:=
+       >=media-video/ffmpeg-6.1:=
        >=media-video/pipewire-0.3:=
        x11-libs/libdrm
 "

diff --git a/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild 
b/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild
index 4b5cd3c994..3eb37f186f 100644
--- a/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.4.90.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
        media-libs/libglvnd
        media-libs/libva:=
        media-libs/mesa[opengl]
-       media-video/ffmpeg:=
+       >=media-video/ffmpeg-6.1:=
        >=media-video/pipewire-0.3:=
        x11-libs/libdrm
 "
@@ -44,10 +44,4 @@ 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 ) )"
 
-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
-}
+PATCHES=( "${FILESDIR}/${PN}-6.4.5-ffmpeg8.patch" )

diff --git a/kde-plasma/kpipewire/kpipewire-6.5.49.9999.ebuild 
b/kde-plasma/kpipewire/kpipewire-6.5.49.9999.ebuild
index 8ba0aec47a..307c64b660 100644
--- a/kde-plasma/kpipewire/kpipewire-6.5.49.9999.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.5.49.9999.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
        media-libs/libglvnd
        media-libs/libva:=
        media-libs/mesa[opengl]
-       media-video/ffmpeg:=
+       >=media-video/ffmpeg-6.1:=
        >=media-video/pipewire-0.3:=
        x11-libs/libdrm
 "

diff --git a/kde-plasma/kpipewire/kpipewire-9999.ebuild 
b/kde-plasma/kpipewire/kpipewire-9999.ebuild
index 2cd3a99dca..3c656a57bb 100644
--- a/kde-plasma/kpipewire/kpipewire-9999.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-9999.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
        media-libs/libglvnd
        media-libs/libva:=
        media-libs/mesa[opengl]
-       media-video/ffmpeg:=
+       >=media-video/ffmpeg-6.1:=
        >=media-video/pipewire-0.3:=
        x11-libs/libdrm
 "