CVS commit: pkgsrc/multimedia/qt6-qtmultimedia

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar  3 09:54:56 UTC 2023

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

Log Message:
qt6-qtmultimedia: make pulseaudio optional


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/qt6-qtmultimedia/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/qt6-qtmultimedia/PLIST \
    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/Makefile
diff -u pkgsrc/multimedia/qt6-qtmultimedia/Makefile:1.2 pkgsrc/multimedia/qt6-qtmultimedia/Makefile:1.3
--- pkgsrc/multimedia/qt6-qtmultimedia/Makefile:1.2     Sun Jan 29 21:14:53 2023
+++ pkgsrc/multimedia/qt6-qtmultimedia/Makefile Fri Mar  3 09:54:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/01/29 21:14:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2023/03/03 09:54:56 tnn Exp $
 
 DISTNAME=      qtmultimedia-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtmultimedia-${QTVERSION}
@@ -12,19 +12,14 @@ CONFIGURE_ARGS+=    -no-alsa
 
 .include "options.mk"
 
-# the pulseaudio option must come after the gstreamer option
-CONFIGURE_ARGS+=       -pulseaudio
-
 .include "../../x11/qt6-qtbase/Makefile.common"
 
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt6Multimedia.pc
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt6MultimediaWidgets.pc
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt6SpatialAudio.pc
 
-.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../graphics/qt6-qtquick3d/buildlink3.mk"
 .include "../../graphics/qt6-qtshadertools/buildlink3.mk"
 .include "../../lang/qt6-qtdeclarative/buildlink3.mk"
-.include "../../multimedia/ffmpeg5/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/qt6-qtmultimedia/PLIST
diff -u pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.1 pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.2
--- pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.1        Mon Nov 28 13:04:40 2022
+++ pkgsrc/multimedia/qt6-qtmultimedia/PLIST    Fri Mar  3 09:54:56 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/11/28 13:04:40 nros Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/03/03 09:54:56 tnn Exp $
 lib/pkgconfig/Qt6Multimedia.pc
 lib/pkgconfig/Qt6MultimediaWidgets.pc
 lib/pkgconfig/Qt6SpatialAudio.pc
@@ -222,12 +222,12 @@ qt6/lib/cmake/Qt6Multimedia/Qt6Multimedi
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaTargets-release.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaTargets.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginAdditionalTargetInfo.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfig.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersion.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersionImpl.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets-release.cmake
-qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginAdditionalTargetInfo.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfig.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersion.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersionImpl.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets-release.cmake
+${PLIST.ffmpeg}qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets.cmake
 ${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginAdditionalTargetInfo.cmake
 ${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfig.cmake
 ${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersion.cmake
@@ -320,7 +320,7 @@ qt6/modules/MultimediaQuickPrivate.json
 qt6/modules/MultimediaWidgets.json
 qt6/modules/Quick3DSpatialAudioPrivate.json
 qt6/modules/SpatialAudio.json
-qt6/plugins/multimedia/libffmpegmediaplugin.so
+${PLIST.ffmpeg}qt6/plugins/multimedia/libffmpegmediaplugin.so
 ${PLIST.gstreamer}qt6/plugins/multimedia/libgstreamermediaplugin.so
 qt6/qml/QtMultimedia/Video.qml
 qt6/qml/QtMultimedia/libquickmultimediaplugin.so
Index: pkgsrc/multimedia/qt6-qtmultimedia/options.mk
diff -u pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.1 pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.2
--- pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.1   Mon Nov 28 13:04:40 2022
+++ pkgsrc/multimedia/qt6-qtmultimedia/options.mk       Fri Mar  3 09:54:56 2023
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2022/11/28 13:04:40 nros Exp $
+# $NetBSD: options.mk,v 1.2 2023/03/03 09:54:56 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qt6-qtmultimedia
-PKG_SUPPORTED_OPTIONS=         gstreamer
+PKG_SUPPORTED_OPTIONS=         gstreamer pulseaudio
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-PLIST_VARS+=                   gstreamer
+PLIST_VARS+=                   gstreamer ffmpeg
 
 .if ${OPSYS} != "Darwin"
-PKG_SUGGESTED_OPTIONS+=                gstreamer
+PKG_SUGGESTED_OPTIONS+=                gstreamer pulseaudio
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -21,3 +21,18 @@ PLIST.gstreamer=     yes
 .else
 CONFIGURE_ARGS+=       -no-gstreamer
 .endif
+
+# the pulseaudio option must come after the gstreamer option
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=       -pulseaudio
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       -no-pulseaudio
+.endif
+
+# For some reason ffmpeg support is conditional on pulseaudio OR apple
+# in src/multimedia/configure.cmake
+.if !empty(PKG_OPTIONS:Mpulseaudio) || ${OPSYS} == "Darwin"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
+PLIST.ffmpeg=          yes
+.endif