CVS commit: pkgsrc/x11/qt5-qtmultimedia

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  5 01:12:14 UTC 2020

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

Log Message:
qt5-qtmultimedia: fix PLIST with -gstreamer and -openal

from Michael Forney


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/qt5-qtmultimedia/PLIST
cvs rdiff -u -r1.2 -r1.3 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.22 pkgsrc/x11/qt5-qtmultimedia/PLIST:1.23
--- pkgsrc/x11/qt5-qtmultimedia/PLIST:1.22      Tue Jun  2 06:41:01 2020
+++ pkgsrc/x11/qt5-qtmultimedia/PLIST   Sun Jul  5 01:12:14 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2020/06/02 06:41:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2020/07/05 01:12:14 nia Exp $
 lib/pkgconfig/Qt5Multimedia.pc
 lib/pkgconfig/Qt5MultimediaWidgets.pc
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
@@ -282,7 +282,7 @@ qt5/include/QtMultimediaWidgets/qvideowi
 qt5/include/QtMultimediaWidgets/qvideowidgetcontrol.h
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
-${PLIST.notdarwin}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.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
 ${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
@@ -330,9 +330,9 @@ ${PLIST.gst}qt5/plugins/mediaservice/lib
 ${PLIST.gst}qt5/plugins/mediaservice/libgstmediacapture.so
 ${PLIST.gst}qt5/plugins/mediaservice/libgstmediaplayer.so
 qt5/plugins/playlistformats/libqtmultimedia_m3u.so
-qt5/qml/QtAudioEngine/libdeclarative_audioengine.so
-qt5/qml/QtAudioEngine/plugins.qmltypes
-qt5/qml/QtAudioEngine/qmldir
+${PLIST.openal}qt5/qml/QtAudioEngine/libdeclarative_audioengine.so
+${PLIST.openal}qt5/qml/QtAudioEngine/plugins.qmltypes
+${PLIST.openal}qt5/qml/QtAudioEngine/qmldir
 qt5/qml/QtMultimedia/Video.qml
 qt5/qml/QtMultimedia/libdeclarative_multimedia.so
 qt5/qml/QtMultimedia/plugins.qmltypes

Index: pkgsrc/x11/qt5-qtmultimedia/options.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/options.mk:1.2 pkgsrc/x11/qt5-qtmultimedia/options.mk:1.3
--- pkgsrc/x11/qt5-qtmultimedia/options.mk:1.2  Sun Mar 22 07:31:42 2020
+++ pkgsrc/x11/qt5-qtmultimedia/options.mk      Sun Jul  5 01:12:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/03/22 07:31:42 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/07/05 01:12:14 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qt5-qtmultimedia
 PKG_SUPPORTED_OPTIONS=         alsa gstreamer openal pulseaudio
@@ -30,7 +30,9 @@ MAKE_ENV+=    QT_CONFIG+=gstreamer-1.0
 MAKE_ENV+=     QT_CONFIG+=-gstreamer-1.0
 .endif
 
+PLIST_VARS+=   openal
 .if !empty(PKG_OPTIONS:Mopenal)
+PLIST.openal=  yes
 MAKE_ENV+=     QT_CONFIG+=openal
 .include "../../audio/openal-soft/buildlink3.mk"
 .else