CVS commit: pkgsrc/multimedia/qt6-qtmultimedia

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr  9 06:13:52 UTC 2023

Modified Files:
        pkgsrc/multimedia/qt6-qtmultimedia: PLIST options.mk

Log Message:
qt6-qtmultimedia: fix build with pulse option turned off


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/qt6-qtmultimedia/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/qt6-qtmultimedia/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/multimedia/qt6-qtmultimedia/PLIST
diff -u pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.3 pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.4
--- pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.3        Fri Apr  7 18:28:04 2023
+++ pkgsrc/multimedia/qt6-qtmultimedia/PLIST    Sun Apr  9 06:13:52 2023
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2023/04/07 18:28:04 nros Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/04/09 06:13:52 wiz Exp $
 lib/pkgconfig/Qt6Multimedia.pc
 lib/pkgconfig/Qt6MultimediaWidgets.pc
 lib/pkgconfig/Qt6SpatialAudio.pc
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodevice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudioengine_pulse_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudioengine_pulse_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiohelpers_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiosystem_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qcamera_p.h
@@ -29,11 +29,11 @@ qt6/include/QtMultimedia/${PKGVERSION}/Q
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformscreencapture_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformvideodevices_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformvideosink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiodevice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiomediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulsehelpers_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiodevice_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiomediadevices_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosink_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosource_p.h
+${PLIST.pulseaudio}qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulsehelpers_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsamplecache_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimedia-config_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaglobal_p.h

Index: pkgsrc/multimedia/qt6-qtmultimedia/options.mk
diff -u pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.2 pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.3
--- pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.2   Fri Mar  3 09:54:56 2023
+++ pkgsrc/multimedia/qt6-qtmultimedia/options.mk       Sun Apr  9 06:13:52 2023
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2023/03/03 09:54:56 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2023/04/09 06:13:52 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qt6-qtmultimedia
 PKG_SUPPORTED_OPTIONS=         gstreamer pulseaudio
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-PLIST_VARS+=                   gstreamer ffmpeg
+PLIST_VARS+=                   ffmpeg gstreamer pulseaudio
 
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=                gstreamer pulseaudio
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=      -no-gstreamer
 # the pulseaudio option must come after the gstreamer option
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 CONFIGURE_ARGS+=       -pulseaudio
+PLIST.pulseaudio=      yes
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       -no-pulseaudio