diff --git a/sysutils/plasma6-kinfocenter/Makefile b/sysutils/plasma6-kinfocenter/Makefile --- a/sysutils/plasma6-kinfocenter/Makefile +++ b/sysutils/plasma6-kinfocenter/Makefile @@ -11,7 +11,6 @@ glxinfo:graphics/mesa-demos \ lsblk:sysutils/lsblk \ lscpu:sysutils/lscpu \ - pipewire:multimedia/pipewire \ vulkaninfo:graphics/vulkan-tools \ wayland-info:graphics/wayland-utils \ xdpyinfo:x11/xdpyinfo @@ -25,6 +24,10 @@ kirigami2:run systemsettings:run USE_QT= base declarative +OPTIONS_DEFINE= PIPEWIRE +OPTIONS_DEFAULT= PIPEWIRE +PIPEWIRE_RUN_DEPENDS= pipewire:multimedia/pipewire + .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/x11-wm/plasma6-kwin/Makefile b/x11-wm/plasma6-kwin/Makefile --- a/x11-wm/plasma6-kwin/Makefile +++ b/x11-wm/plasma6-kwin/Makefile @@ -16,7 +16,6 @@ libfreetype.so:print/freetype2 \ libinput.so:x11/libinput \ liblcms2.so:graphics/lcms2 \ - libpipewire-0.3.so:multimedia/pipewire \ libqaccessibilityclient-qt6.so:accessibility/libqaccessibilityclient@qt6 \ libudev.so:devel/libudev-devd \ libwayland-client.so:graphics/wayland \ @@ -36,7 +35,7 @@ USE_KDE= activities attica auth breeze colorscheme config \ configwidgets coreaddons crash dbusaddons decoration \ globalaccel globalacceld guiaddons i18n idletime kcmutils \ - kdeclarative kpipewire kscreenlocker libplasma newstuff \ + kdeclarative kscreenlocker libplasma newstuff \ notifications package runner service svg wayland widgetsaddons \ windowsystem xmlgui \ ecm:build plasma-wayland-protocols:build @@ -46,6 +45,12 @@ BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= src/plugins/strip-effect-metadata.py +OPTIONS_DEFINE= PIPEWIRE +OPTIONS_DEFAULT= PIPEWIRE +OPTIONS_SUB= yes +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_USE= KDE=kpipewire + post-patch: # Fix version in tarball ${REINPLACE_CMD} "/set(PROJECT_VERSION/s,6.3.2,6.3.3," ${WRKSRC}/CMakeLists.txt diff --git a/x11-wm/plasma6-kwin/pkg-plist b/x11-wm/plasma6-kwin/pkg-plist --- a/x11-wm/plasma6-kwin/pkg-plist +++ b/x11-wm/plasma6-kwin/pkg-plist @@ -319,7 +319,7 @@ %%QT_PLUGINDIR%%/kwin/plugins/eis.so %%QT_PLUGINDIR%%/kwin/plugins/krunnerintegration.so %%QT_PLUGINDIR%%/kwin/plugins/nightlight.so -%%QT_PLUGINDIR%%/kwin/plugins/screencast.so +%%PIPEWIRE%%%%QT_PLUGINDIR%%/kwin/plugins/screencast.so %%QT_PLUGINDIR%%/org.kde.kdecoration3.kcm/kcm_auroraedecoration.so %%QT_PLUGINDIR%%/org.kde.kdecoration3/org.kde.kwin.aurorae.so %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_kwin_effects.so diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile --- a/x11/plasma6-plasma-desktop/Makefile +++ b/x11/plasma6-plasma-desktop/Makefile @@ -35,12 +35,13 @@ package plasma-workspace plasma5support runner service solid \ sonnet svg widgetsaddons windowsystem xmlgui \ ecm:build \ - kirigami-addons:run kirigami2:run kpipewire:run \ + kirigami-addons:run kirigami2:run \ qqc2-desktop-style:run USE_QT= 5compat base declarative svg wayland USE_XORG= x11 xcb xcursor xext xfixes xi xrender -OPTIONS_DEFINE= SDL +OPTIONS_DEFINE= PIPEWIRE SDL +OPTIONS_DEFAULT= PIPEWIRE OPTIONS_GROUP= IM IM_DESC= Input Method Support OPTIONS_GROUP_IM= IBUS SCIM @@ -50,6 +51,8 @@ IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus IBUS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_IBus +PIPEWIRE_USE= KDE=kpipewire:run + SCIM_DESC= Enable SCIM backend for input dialog SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim SCIM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_SCIM diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile --- a/x11/plasma6-plasma-workspace/Makefile +++ b/x11/plasma6-plasma-workspace/Makefile @@ -13,7 +13,6 @@ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libicui18n.so:devel/icu \ - libpipewire-0.3.so:multimedia/pipewire \ libqalculate.so:math/libqalculate \ libudev.so:devel/libudev-devd \ libwayland-client.so:graphics/wayland \ @@ -35,7 +34,7 @@ coreaddons crash dbusaddons doctools filemetadata globalaccel \ guiaddons holidays i18n iconthemes idletime itemmodels \ itemviews jobwidgets kcmutils kdeclarative kio kirigami-addons \ - kirigami2 kpipewire kquickcharts kscreenlocker kwin \ + kirigami2 kquickcharts kscreenlocker kwin \ layer-shell-qt libkexiv2 libkscreen libksysguard libplasma \ newstuff notifications notifyconfig package parts phonon \ plasma5support prison runner service solid sonnet \ @@ -47,6 +46,12 @@ USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xft xi xrender xtst SHEBANG_FILES= components/calendar/kconf_update/migrate-calendar-to-plugin-id.py.in +OPTIONS_DEFINE= PIPEWIRE +OPTIONS_DEFAULT= PIPEWIRE +OPTIONS_SUB= yes +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_USE= KDE=kpipewire + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/startkde/startplasma.cpp \ diff --git a/x11/plasma6-plasma-workspace/pkg-plist b/x11/plasma6-plasma-workspace/pkg-plist --- a/x11/plasma6-plasma-workspace/pkg-plist +++ b/x11/plasma6-plasma-workspace/pkg-plist @@ -6048,7 +6048,7 @@ share/metainfo/org.kde.plasma.analogclock.appdata.xml share/metainfo/org.kde.plasma.appmenu.appdata.xml share/metainfo/org.kde.plasma.calendar.appdata.xml -share/metainfo/org.kde.plasma.cameraindicator.appdata.xml +%%PIPEWIRE%%share/metainfo/org.kde.plasma.cameraindicator.appdata.xml share/metainfo/org.kde.plasma.clipboard.appdata.xml share/metainfo/org.kde.plasma.devicenotifier.appdata.xml share/metainfo/org.kde.plasma.digitalclock.appdata.xml @@ -6170,9 +6170,9 @@ share/plasma/plasmoids/org.kde.plasma.calendar/contents/ui/configGeneral.qml share/plasma/plasmoids/org.kde.plasma.calendar/contents/ui/main.qml share/plasma/plasmoids/org.kde.plasma.calendar/metadata.json -share/plasma/plasmoids/org.kde.plasma.cameraindicator/contents/ui/FullRepresentation.qml -share/plasma/plasmoids/org.kde.plasma.cameraindicator/contents/ui/main.qml -share/plasma/plasmoids/org.kde.plasma.cameraindicator/metadata.json +%%PIPEWIRE%%share/plasma/plasmoids/org.kde.plasma.cameraindicator/contents/ui/FullRepresentation.qml +%%PIPEWIRE%%share/plasma/plasmoids/org.kde.plasma.cameraindicator/contents/ui/main.qml +%%PIPEWIRE%%share/plasma/plasmoids/org.kde.plasma.cameraindicator/metadata.json share/plasma/plasmoids/org.kde.plasma.clipboard/contents/config/main.xml share/plasma/plasmoids/org.kde.plasma.clipboard/contents/ui/main.qml share/plasma/plasmoids/org.kde.plasma.clipboard/metadata.json diff --git a/x11/plasma6-plasma/Makefile b/x11/plasma6-plasma/Makefile --- a/x11/plasma6-plasma/Makefile +++ b/x11/plasma6-plasma/Makefile @@ -8,11 +8,12 @@ WWW= https://www.kde.org/plasma-desktop USES= kde:6 metaport qt:6 -USE_KDE= ${_USE_PLASMA_ALL:Nplasma-pa} +USE_KDE= ${_USE_PLASMA_ALL:Nkpipewire:Nplasma-pa} -OPTIONS_DEFINE= PULSEAUDIO QT5 +OPTIONS_DEFINE= PIPEWIRE PULSEAUDIO QT5 OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +PIPEWIRE_USE= KDE=kpipewire PULSEAUDIO_USE= KDE=plasma-pa:run QT5_DESC= Install Plasma 6 integration plugins for Qt5 applications QT5_RUN_DEPENDS= plasma6-plasma-integration-qt5>0:x11/plasma6-plasma-integration@qt5