Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtmultimedia qt5-qtmultimedia: fix PLIST with ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c8edd7c0fc3
branches:  trunk
changeset: 435312:5c8edd7c0fc3
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jul 05 01:12:14 2020 +0000

description:
qt5-qtmultimedia: fix PLIST with -gstreamer and -openal

from Michael Forney

diffstat:

 x11/qt5-qtmultimedia/PLIST      |  10 +++++-----
 x11/qt5-qtmultimedia/options.mk |   4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r ae9517373999 -r 5c8edd7c0fc3 x11/qt5-qtmultimedia/PLIST
--- a/x11/qt5-qtmultimedia/PLIST        Sun Jul 05 00:14:48 2020 +0000
+++ b/x11/qt5-qtmultimedia/PLIST        Sun Jul 05 01:12:14 2020 +0000
@@ -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/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/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 -r ae9517373999 -r 5c8edd7c0fc3 x11/qt5-qtmultimedia/options.mk
--- a/x11/qt5-qtmultimedia/options.mk   Sun Jul 05 00:14:48 2020 +0000
+++ b/x11/qt5-qtmultimedia/options.mk   Sun Jul 05 01:12:14 2020 +0000
@@ -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
 .endif
 
+PLIST_VARS+=   openal
 .if !empty(PKG_OPTIONS:Mopenal)
+PLIST.openal=  yes
 MAKE_ENV+=     QT_CONFIG+=openal
 .include "../../audio/openal-soft/buildlink3.mk"
 .else



Home | Main Index | Thread Index | Old Index