commit: c8d1666f0c223f9a93c7da7820e0a687b1db67b1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 23:53:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 20:42:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1666f
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 <AT> gentoo.org>
.../files/kwin-5.90.90-gstreamer-optional.patch | 25 ----------------------
.../{kwin-6.0.1-r1.ebuild => kwin-6.0.1-r2.ebuild} | 15 +++++++------
kde-plasma/kwin/metadata.xml | 1 +
3 files changed, 10 insertions(+), 31 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 dfd544af0058..000000000000
--- 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 <[email protected]>
-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.1-r1.ebuild
b/kde-plasma/kwin/kwin-6.0.1-r2.ebuild
similarity index 93%
rename from kde-plasma/kwin/kwin-6.0.1-r1.ebuild
rename to kde-plasma/kwin/kwin-6.0.1-r2.ebuild
index 0968b936c57a..cb808dc2ddd8 100644
--- a/kde-plasma/kwin/kwin-6.0.1-r1.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.1-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for
windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="6"
KEYWORDS="~amd64"
-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 74751f22f2b9..4903bdce5a1e 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -11,6 +11,7 @@
<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>
</pkgmetadata>
