commit:     a1a5e4337fd1c130b768f806a0feba5434ed3763
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 13:34:26 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 20:41:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1a5e433

kde-plasma/plasma-workspace: Update IUSE screencast, dependencies

Upstream commits:
039315ab9f6360c12dfbfc5f7b3dbf5d294175c7
b2a5a2caf1c1be2acbf9ce6c3c25f1c82d4c8792
b2a10a33aa5860abd3ba35f7b450f5ca16401887

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

 kde-plasma/plasma-workspace/metadata.xml                 |  2 +-
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/plasma-workspace/metadata.xml 
b/kde-plasma/plasma-workspace/metadata.xml
index 427c617b66..7e53a7fa49 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -12,7 +12,7 @@
                <flag name="appstream">Enable AppStream software metadata 
support</flag>
                <flag name="geolocation">Enables dataengine providing location 
information</flag>
                <flag name="policykit">Enable locale generation and Users KCM 
using <pkg>sys-auth/polkit</pkg> and <pkg>sys-apps/accountsservice</pkg></flag>
-               <flag name="screencast">Enable screencast portal using 
<pkg>kde-plasma/kpipewire</pkg></flag>
+               <flag name="screencast">Enable camera indicator applet 
(requires <pkg>media-video/pipewire</pkg> at runtime)</flag>
                <flag name="telemetry">Enable User Feedback control module for 
<pkg>kde-plasma/systemsettings</pkg></flag>
                <flag name="wallpaper-metadata">Show metadata for image 
wallpaper plugin using <pkg>kde-apps/libkexiv2</pkg></flag>
        </use>

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index e58143f577..fd230a8e29 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -111,12 +111,6 @@ COMMON_DEPEND="
                >=sys-auth/polkit-qt-0.175[qt6(+)]
                virtual/libcrypt:=
        )
-       screencast? (
-               >=dev-qt/qtbase-${QTMIN}:6=
-               media-libs/libglvnd
-               >=media-video/pipewire-0.3:=
-               x11-libs/libdrm
-       )
        semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
        systemd? ( sys-apps/systemd:= )
        telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
@@ -128,6 +122,7 @@ DEPEND="${COMMON_DEPEND}
        >=dev-qt/qtbase-${QTMIN}:6[concurrent]
        x11-base/xorg-proto
        fontconfig? ( x11-libs/libXrender )
+       test? ( screencast? ( >=media-video/pipewire-0.3:* ) )
 "
 RDEPEND="${COMMON_DEPEND}
        !kde-plasma/libkworkspace:5
@@ -150,6 +145,7 @@ RDEPEND="${COMMON_DEPEND}
        x11-apps/xprop
        x11-apps/xrdb
        policykit? ( sys-apps/accountsservice )
+       screencast? ( >=media-video/pipewire-0.3:* )
 "
 BDEPEND="
        >=dev-qt/qtwayland-${QTMIN}:6
@@ -168,11 +164,6 @@ src_prepare() {
 
        cmake_comment_add_subdirectory login-sessions
 
-       # TODO: try to get a build switch upstreamed
-       if ! use screencast; then
-               sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt 
|| die
-       fi
-
        if ! use policykit; then
                cmake_run_in kcms cmake_comment_add_subdirectory users
        fi
@@ -196,6 +187,7 @@ src_configure() {
                $(cmake_use_find_package appstream AppStreamQt)
                $(cmake_use_find_package calendar KF6Holidays)
                $(cmake_use_find_package fontconfig Fontconfig)
+               -DBUILD_CAMERAINDICATOR=$(usex screencast)
                $(cmake_use_find_package semantic-desktop KF6Baloo)
                $(cmake_use_find_package telemetry KF6UserFeedback)
                $(cmake_use_find_package wallpaper-metadata KExiv2Qt6)

Reply via email to