summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-07-05 01:12:14 +0000
committernia <nia@pkgsrc.org>2020-07-05 01:12:14 +0000
commitbbfef66463864954f43addf66be6fc4568352e7c (patch)
treedc60639b25e929e60e0b69d299e6858e8240d638 /x11
parent6244791be1eaeea3fa6e72202f3752f4e2bac423 (diff)
downloadpkgsrc-bbfef66463864954f43addf66be6fc4568352e7c.tar.gz
qt5-qtmultimedia: fix PLIST with -gstreamer and -openal
from Michael Forney
Diffstat (limited to 'x11')
-rw-r--r--x11/qt5-qtmultimedia/PLIST10
-rw-r--r--x11/qt5-qtmultimedia/options.mk4
2 files changed, 8 insertions, 6 deletions
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index b70ac80eaad..7814d351805 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -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/qvideowidget.h
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/libgstcamerabin.so
${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
diff --git a/x11/qt5-qtmultimedia/options.mk b/x11/qt5-qtmultimedia/options.mk
index 0e85a1af0c0..17d429976fd 100644
--- a/x11/qt5-qtmultimedia/options.mk
+++ b/x11/qt5-qtmultimedia/options.mk
@@ -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