CVS commit: pkgsrc/www/qt6-qtwebengine

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 29 16:54:28 UTC 2026

Modified Files:
        pkgsrc/www/qt6-qtwebengine: Makefile
Added Files:
        pkgsrc/www/qt6-qtwebengine: options.mk

Log Message:
qt6-qtwebengine: make pulseaudio dependency optional


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/qt6-qtwebengine/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/qt6-qtwebengine/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/www/qt6-qtwebengine/Makefile
diff -u pkgsrc/www/qt6-qtwebengine/Makefile:1.7 pkgsrc/www/qt6-qtwebengine/Makefile:1.8
--- pkgsrc/www/qt6-qtwebengine/Makefile:1.7     Sun Mar 29 16:43:50 2026
+++ pkgsrc/www/qt6-qtwebengine/Makefile Sun Mar 29 16:54:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2026/03/29 16:43:50 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2026/03/29 16:54:28 tnn Exp $
 
 DISTNAME=      qtwebengine-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtwebengine-${QTVERSION}
@@ -68,7 +68,6 @@ CMAKE_CONFIGURE_ARGS+=                -DQT_FEATURE_web
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
 CMAKE_CONFIGURE_ARGS+=         -DQT_FEATURE_webengine_system_sndio=ON
 .endif
-CMAKE_CONFIGURE_ARGS+=         -DQT_FEATURE_webengine_system_pulseaudio=ON
 
 CONFIGURE_ENV+=                        NINJAFLAGS=-j${_MAKE_JOBS_N:U1}
 
@@ -104,6 +103,8 @@ SUBST_VARS.path+=   PREFIX PKG_SYSCONFBASE
 
 NOT_PAX_MPROTECT_SAFE+=        qt6/libexec/QtWebEngineProcess
 
+.include "options.mk"
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -j ${_MAKE_JOBS_N:U1} ${BUILD_TARGET}
 
@@ -115,7 +116,6 @@ do-install:
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../audio/libopus/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .endif

Added files:

Index: pkgsrc/www/qt6-qtwebengine/options.mk
diff -u /dev/null pkgsrc/www/qt6-qtwebengine/options.mk:1.1
--- /dev/null   Sun Mar 29 16:54:28 2026
+++ pkgsrc/www/qt6-qtwebengine/options.mk       Sun Mar 29 16:54:28 2026
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2026/03/29 16:54:28 tnn Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qt6-qtwebengine
+PKG_SUPPORTED_OPTIONS= pulseaudio
+PKG_SUGGESTED_OPTIONS= pulseaudio
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_CONFIGURE_ARGS+=         -DQT_FEATURE_webengine_system_pulseaudio=ON
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+=         -DQT_FEATURE_webengine_system_pulseaudio=OFF
+.endif