CVS commit: pkgsrc/audio/pulseaudio

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 17 21:25:59 UTC 2026

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile PLIST options.mk

Log Message:
pulseaudio: make consolekit a default-off option

Support for it was already disabled on Linux and Darwin, and
I wouldn't bet on the *BSD support in consolekit.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/pulseaudio/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/pulseaudio/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.187 pkgsrc/audio/pulseaudio/Makefile:1.188
--- pkgsrc/audio/pulseaudio/Makefile:1.187      Thu Oct 23 20:35:52 2025
+++ pkgsrc/audio/pulseaudio/Makefile    Sat Jan 17 21:25:59 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.187 2025/10/23 20:35:52 wiz Exp $
+# $NetBSD: Makefile,v 1.188 2026/01/17 21:25:59 wiz Exp $
 
 DISTNAME=      pulseaudio-17.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  https://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -130,9 +130,6 @@ PKG_USERS=          ${PULSE_USER}:${PULSE_GROUP}
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-version-script=${WRKSRC}/src/pulse/map-file
 
 .include "../../devel/meson/build.mk"
-.if ${OPSYS} != Linux && ${OPSYS} != "Darwin"
-.include "../../sysutils/consolekit/buildlink3.mk"
-.endif
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.48 pkgsrc/audio/pulseaudio/PLIST:1.49
--- pkgsrc/audio/pulseaudio/PLIST:1.48  Tue May  6 07:52:26 2025
+++ pkgsrc/audio/pulseaudio/PLIST       Sat Jan 17 21:25:59 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2025/05/06 07:52:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2026/01/17 21:25:59 wiz Exp $
 bin/pa-info
 bin/pacat
 bin/pacmd
@@ -85,7 +85,7 @@ lib/pulseaudio/modules/module-cli-protoc
 lib/pulseaudio/modules/module-cli.${SHLIB_EXT}
 lib/pulseaudio/modules/module-combine-sink.${SHLIB_EXT}
 lib/pulseaudio/modules/module-combine.${SHLIB_EXT}
-lib/pulseaudio/modules/module-console-kit.${SHLIB_EXT}
+${PLIST.consolekit}lib/pulseaudio/modules/module-console-kit.${SHLIB_EXT}
 lib/pulseaudio/modules/module-dbus-protocol.${SHLIB_EXT}
 lib/pulseaudio/modules/module-default-device-restore.${SHLIB_EXT}
 lib/pulseaudio/modules/module-detect.${SHLIB_EXT}

Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.17 pkgsrc/audio/pulseaudio/options.mk:1.18
--- pkgsrc/audio/pulseaudio/options.mk:1.17     Sat May  4 18:39:00 2024
+++ pkgsrc/audio/pulseaudio/options.mk  Sat Jan 17 21:25:59 2026
@@ -1,14 +1,18 @@
-# $NetBSD: options.mk,v 1.17 2024/05/04 18:39:00 tnn Exp $
+# $NetBSD: options.mk,v 1.18 2026/01/17 21:25:59 wiz Exp $
 
 .include "../../comms/lirc/available.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.pulseaudio
-PKG_SUPPORTED_OPTIONS= avahi gsettings x11
+PKG_OPTIONS_VAR=               PKG_OPTIONS.pulseaudio
+PKG_SUPPORTED_OPTIONS=         avahi consolekit gsettings x11
 .if ${LIRC_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+=        lirc
+PKG_SUPPORTED_OPTIONS+=                lirc
 .endif
-PKG_SUGGESTED_OPTIONS= avahi x11
-PLIST_VARS+=           avahi gsettings x11 lirc
+PKG_SUGGESTED_OPTIONS=         avahi x11
+#.if ${OPSYS} != Linux && ${OPSYS} != "Darwin"
+#PKG_SUGGESTED_OPTIONS+=       consolekit
+#.endif
+
+PLIST_VARS+=           avahi consolekit gsettings x11 lirc
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,6 +23,13 @@ PLIST.avahi=         yes
 MESON_ARGS+=           -Davahi=disabled
 .endif
 
+.if !empty(PKG_OPTIONS:Mconsolekit)
+.include "../../sysutils/consolekit/buildlink3.mk"
+PLIST.consolekit=      yes
+.else
+MESON_ARGS+=           -Dconsolekit=disabled
+.endif
+
 .if !empty(PKG_OPTIONS:Mgsettings)
 PLIST.gsettings=       yes
 MESON_ARGS+=           -Dgsettings=enabled