kde-plasma/kwin: Drop dev-qt/qtmultimedia[gstreamer] USEdep

Qt6Multimedia ensures a video backend is available, w/ ffmpeg as default.

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

4 files changed, 18 insertions, 38 deletions

diff --git a/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
deleted file mode 100644
index dfd544af00..0000000000
--- a/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3b851958984a2028780ee6078004690ca2b0723b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 6 Aug 2019 22:36:44 +0200
-Subject: [PATCH] Disable the effect video button if gstreamer is missing
-
----
- src/kcms/effects/ui/Effect.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kcms/effects/ui/Effect.qml b/src/kcms/effects/ui/Effect.qml
-index e4a7daca7e..23d32e63a1 100644
---- a/src/kcms/effects/ui/Effect.qml
-+++ b/src/kcms/effects/ui/Effect.qml
-@@ -120,7 +120,7 @@ QQC2.ItemDelegate {
-         }
- 
-         QQC2.ToolButton {
--            visible: model.VideoRole.toString() !== ""
-+            visible: false
-             icon.name: "videoclip-amarok"
-             text: i18nc("@info:tooltip", "Show/Hide Video")
-             display: QQC2.AbstractButton.IconOnly
--- 
-2.43.0
-
diff --git a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
index bdd5083917..2f1fc7b3e1 100644
--- a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
-IUSE="accessibility caps gles2-only lock multimedia screencast +shortcuts"
+IUSE="accessibility caps gles2-only lock screencast +shortcuts"
 
 RESTRICT="test"
 
@@ -78,15 +78,19 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kdeplasma-addons:5
 	!kde-plasma/kwayland-server
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
 	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-plasma/libplasma-${PVCUT}:6[wayland]
 	sys-apps/hwdata
 	x11-base/xwayland
-	multimedia? (
-		>=dev-qt/qtmultimedia-${QTMIN}:6[gstreamer,qml]
-		media-plugins/gst-plugins-soup:1.0
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.11.1
@@ -108,7 +112,6 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
 src_prepare() {
 	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.90.90-gstreamer-optional.patch"
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 7b9df0fd21..6c7dd44b6b 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
-IUSE="accessibility caps gles2-only lock multimedia screencast +shortcuts"
+IUSE="accessibility caps gles2-only lock screencast +shortcuts"
 
 RESTRICT="test"
 
@@ -78,15 +78,19 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kdeplasma-addons:5
 	!kde-plasma/kwayland-server
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
 	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-plasma/libplasma-${PVCUT}:6[wayland]
 	sys-apps/hwdata
 	x11-base/xwayland
-	multimedia? (
-		>=dev-qt/qtmultimedia-${QTMIN}:6[gstreamer,qml]
-		media-plugins/gst-plugins-soup:1.0
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.11.1
@@ -108,7 +112,6 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
 src_prepare() {
 	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.90.90-gstreamer-optional.patch"
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 4903bdce5a..bb4709286c 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
-		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="shortcuts">Enable global shortcuts support via <pkg>kde-plasma/kglobalacceld</pkg></flag>
 	</use>