Page MenuHomeFreeBSD
Files F144465789

D49009.id151043.diff
No OneTemporary
Actions

D49009.id151043.diff
View Options

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
@@ -20,7 +20,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 \
@@ -40,7 +39,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
@@ -50,4 +49,10 @@
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
+
.include <bsd.port.mk>
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
@@ -32,15 +32,19 @@
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
USE_XORG= x11 xcb xcursor xext xfixes xi xrender
-OPTIONS_DEFINE= SDL
+OPTIONS_DEFINE= PIPEWIRE SDL
+OPTIONS_DEFAULT=PIPEWIRE
OPTIONS_SUB= yes
SDL_DESC= Enable gamecontroller System Settings module (requires SDL)
+
+PIPEWIRE_USE= KDE=kpipewire:run
+
SDL_USES= sdl
SDL_USE= sdl=sdl2
SDL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_SDL2:BOOL=On
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
@@ -12,7 +12,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 \
@@ -31,7 +30,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 \
@@ -43,6 +42,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
@@ -6026,7 +6026,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
@@ -6148,9 +6148,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
@@ -9,12 +9,14 @@
USES= kde:6 metaport qt:6
# remove:
+# * kpipewire no kpipewire (pipewire) by default
# * plasma-pa no plasma-pa (pulseaudio) by default
-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

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 2:22 PM (1 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28588436
Default Alt Text
D49009.id151043.diff (6 KB)

Event Timeline