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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31046158041 for ; Fri, 8 Mar 2024 20:44:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A1C5E29AC; Fri, 8 Mar 2024 20:44:53 +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 E5CC2E29AC for ; Fri, 8 Mar 2024 20:44:52 +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 C5650335DC0 for ; Fri, 8 Mar 2024 20:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2043D137F for ; Fri, 8 Mar 2024 20:44:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1709930548.c8d1666f0c223f9a93c7da7820e0a687b1db67b1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch kde-plasma/kwin/kwin-6.0.1-r1.ebuild kde-plasma/kwin/kwin-6.0.1-r2.ebuild kde-plasma/kwin/metadata.xml X-VCS-Directories: kde-plasma/kwin/ kde-plasma/kwin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c8d1666f0c223f9a93c7da7820e0a687b1db67b1 X-VCS-Branch: master Date: Fri, 8 Mar 2024 20:44:50 +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: ac3b0a67-4269-4607-9f56-530efb9e8a10 X-Archives-Hash: 607c8e428417e9b984473aa75143e417 commit: c8d1666f0c223f9a93c7da7820e0a687b1db67b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 7 23:53:34 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 @@ Enable screen locking via kde-plasma/kscreenlocker Enable effect video button in desktop effects KCM + Enable screencast portal using media-video/pipewire Enable global shortcuts support via kde-plasma/kglobalacceld