tech-pkg archive

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

[PATCH 2/2] qt5-qtmultimedia: fix PLIST with -gstreamer and -openal



The src/plugins/gstreamer/camerabin subdirectory is conditional on
gstreamer, regardless of platform:

https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/plugins.pro?h=5.15.0#n47
https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/gstreamer/gstreamer.pro?h=5.15.0#n5

The src/imports/audioengine subdirectory is conditional on openal:

https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/imports/imports.pro?h=5.15.0#n5
---
 x11/qt5-qtmultimedia/PLIST      | 8 ++++----
 x11/qt5-qtmultimedia/options.mk | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index b70ac80eaad..429ed316263 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -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..7989cfcdf01 100644
--- a/x11/qt5-qtmultimedia/options.mk
+++ b/x11/qt5-qtmultimedia/options.mk
@@ -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
-- 
2.27.0



Home | Main Index | Thread Index | Old Index