CVS commit: pkgsrc/x11/qt5-qtmultimedia

["Michael Forney" <mcf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mcf
Date:           Tue Nov 17 04:46:35 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qtmultimedia: PLIST PLIST.Darwin options.mk

Log Message:
qt5-qtmultimedia: audioengine plugin is conditional on -gstreamer

Except on QNX and Darwin, where it is always enabled:
https://github.com/qt/qtmultimedia/blob/v5.15.1/src/plugins/plugins.pro


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/qt5-qtmultimedia/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-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/x11/qt5-qtmultimedia/PLIST
diff -u pkgsrc/x11/qt5-qtmultimedia/PLIST:1.23 pkgsrc/x11/qt5-qtmultimedia/PLIST:1.24
--- pkgsrc/x11/qt5-qtmultimedia/PLIST:1.23      Sun Jul  5 01:12:14 2020
+++ pkgsrc/x11/qt5-qtmultimedia/PLIST   Tue Nov 17 04:46:35 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/07/05 01:12:14 nia Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/11/17 04:46:35 mcf Exp $
 lib/pkgconfig/Qt5Multimedia.pc
 lib/pkgconfig/Qt5MultimediaWidgets.pc
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
@@ -282,6 +282,7 @@ qt5/include/QtMultimediaWidgets/qvideowi
 qt5/include/QtMultimediaWidgets/qvideowidgetcontrol.h
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
+${PLIST.audioengine}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
 ${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
 ${PLIST.alsa}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QAlsaPlugin.cmake
 ${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
@@ -324,6 +325,7 @@ qt5/mkspecs/modules/qt_lib_multimediawid
 qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
 qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
 ${PLIST.alsa}qt5/plugins/audio/libqtaudio_alsa.so
+${PLIST.audioengine}qt5/plugins/mediaservice/libqtmedia_audioengine.so
 ${PLIST.pulse}qt5/plugins/audio/libqtmedia_pulse.so
 ${PLIST.gst}qt5/plugins/mediaservice/libgstaudiodecoder.so
 ${PLIST.gst}qt5/plugins/mediaservice/libgstcamerabin.so

Index: pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin
diff -u pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin:1.2 pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin:1.3
--- pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin:1.2        Tue Jan 21 20:25:38 2020
+++ pkgsrc/x11/qt5-qtmultimedia/PLIST.Darwin    Tue Nov 17 04:46:35 2020
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2020/01/21 20:25:38 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2020/11/17 04:46:35 mcf Exp $
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFMediaPlayerServicePlugin.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFServicePlugin.cmake
-qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake
 qt5/plugins/audio/libqtaudio_coreaudio.so
 qt5/plugins/mediaservice/libqavfcamera.so
 qt5/plugins/mediaservice/libqavfmediaplayer.so
-qt5/plugins/mediaservice/libqtmedia_audioengine.so

Index: pkgsrc/x11/qt5-qtmultimedia/options.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/options.mk:1.4 pkgsrc/x11/qt5-qtmultimedia/options.mk:1.5
--- pkgsrc/x11/qt5-qtmultimedia/options.mk:1.4  Wed Jul  8 14:49:14 2020
+++ pkgsrc/x11/qt5-qtmultimedia/options.mk      Tue Nov 17 04:46:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/07/08 14:49:14 adam Exp $
+# $NetBSD: options.mk,v 1.5 2020/11/17 04:46:35 mcf Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qt5-qtmultimedia
 PKG_SUPPORTED_OPTIONS=         alsa gstreamer openal pulseaudio
@@ -50,3 +50,8 @@ MAKE_ENV+=    QT_CONFIG+=pulseaudio
 .else
 MAKE_ENV+=     QT_CONFIG+=-pulseaudio
 .endif
+
+PLIST_VARS+=           audioengine
+.if ${OPSYS} == "QNX" || ${OPSYS} == "Darwin" || empty(PKG_OPTIONS:Mgstreamer)
+PLIST.audioengine=     yes
+.endif