pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/qt5-qtmultimedia
Module Name: pkgsrc
Committed By: nia
Date: Thu Mar 5 12:32:40 UTC 2020
Modified Files:
pkgsrc/x11/qt5-qtmultimedia: Makefile PLIST
Added Files:
pkgsrc/x11/qt5-qtmultimedia: options.mk
Log Message:
qt5-qtmultimedia: Make various plugins (pulse, alsa, openal, gst) optional.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/qt5-qtmultimedia/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/qt5-qtmultimedia/PLIST
cvs rdiff -u -r0 -r1.1 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/Makefile
diff -u pkgsrc/x11/qt5-qtmultimedia/Makefile:1.58 pkgsrc/x11/qt5-qtmultimedia/Makefile:1.59
--- pkgsrc/x11/qt5-qtmultimedia/Makefile:1.58 Tue Jan 21 20:25:38 2020
+++ pkgsrc/x11/qt5-qtmultimedia/Makefile Thu Mar 5 12:32:40 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2020/01/21 20:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.59 2020/03/05 12:32:40 nia Exp $
DISTNAME= qtmultimedia-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtmultimedia-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for multimedia
BUILD_TARGET= sub-src
@@ -11,26 +12,12 @@ INSTALLATION_DIRS+= lib/pkgconfig
.include "../../x11/qt5-qtbase/Makefile.common"
-.if ${OPSYS} != "Darwin"
-MAKE_ENV+= LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio
-.endif
-
post-install:
.for i in Qt5Multimedia.pc Qt5MultimediaWidgets.pc
cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
.endfor
-PLIST_VARS+= alsa
-.if ${OPSYS} == "Linux"
-.include "../../audio/alsa-lib/buildlink3.mk"
-PLIST.alsa= yes
-.endif
-
-.if ${OPSYS} != "Darwin"
-.include "../../audio/openal-soft/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.endif
+.include "options.mk"
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/qt5-qtmultimedia/PLIST
diff -u pkgsrc/x11/qt5-qtmultimedia/PLIST:1.19 pkgsrc/x11/qt5-qtmultimedia/PLIST:1.20
--- pkgsrc/x11/qt5-qtmultimedia/PLIST:1.19 Wed Jan 22 13:28:53 2020
+++ pkgsrc/x11/qt5-qtmultimedia/PLIST Thu Mar 5 12:32:40 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/01/22 13:28:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/03/05 12:32:40 nia Exp $
lib/pkgconfig/Qt5Multimedia.pc
lib/pkgconfig/Qt5MultimediaWidgets.pc
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
@@ -224,34 +224,34 @@ qt5/include/QtMultimedia/qvideoprobe.h
qt5/include/QtMultimedia/qvideorenderercontrol.h
qt5/include/QtMultimedia/qvideosurfaceformat.h
qt5/include/QtMultimedia/qvideowindowcontrol.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/gstvideoconnector_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstappsrc_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstbufferpoolinterface_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstcodecsinfo_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreameraudioinputselector_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreameraudioprobecontrol_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerbushelper_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamermessage_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerplayersession_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideooverlay_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideoprobecontrol_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideorenderer_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideorendererinterface_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideowidget_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideowindow_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgsttools_global_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstutils_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideobuffer_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideorenderersink_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h
-${PLIST.unix}qt5/include/QtMultimediaGstTools/QtMultimediaGstTools
-${PLIST.unix}qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsDepends
-${PLIST.unix}qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsVersion
-${PLIST.unix}qt5/include/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/gstvideoconnector_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstappsrc_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstbufferpoolinterface_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstcodecsinfo_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreameraudioinputselector_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreameraudioprobecontrol_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerbushelper_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamermessage_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamerplayersession_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideooverlay_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideoprobecontrol_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideorenderer_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideorendererinterface_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideowidget_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstreamervideowindow_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgsttools_global_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstutils_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideobuffer_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qgstvideorenderersink_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/${PKGVERSION}/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h
+${PLIST.gst}qt5/include/QtMultimediaGstTools/QtMultimediaGstTools
+${PLIST.gst}qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsDepends
+${PLIST.gst}qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsVersion
+${PLIST.gst}qt5/include/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_backend_p.h
qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_p.h
qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
@@ -284,13 +284,13 @@ qt5/lib/cmake/Qt5Multimedia/Qt5Multimedi
qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
${PLIST.alsa}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QAlsaPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake
+${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
+${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
+${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake
qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake
+${PLIST.pulse}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
+${PLIST.gst}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
+${PLIST.gst}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake
qt5/lib/cmake/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake
qt5/lib/cmake/Qt5MultimediaQuick/Qt5MultimediaQuickConfigVersion.cmake
qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
@@ -300,11 +300,11 @@ qt5/lib/libQt5Multimedia.so
qt5/lib/libQt5Multimedia.so.${PKGVERSION}
qt5/lib/libQt5Multimedia.so.5
qt5/lib/libQt5Multimedia.so.5.14
-${PLIST.unix}qt5/lib/libQt5MultimediaGstTools.prl
-${PLIST.unix}qt5/lib/libQt5MultimediaGstTools.so
-${PLIST.unix}qt5/lib/libQt5MultimediaGstTools.so.${PKGVERSION}
-${PLIST.unix}qt5/lib/libQt5MultimediaGstTools.so.5
-${PLIST.unix}qt5/lib/libQt5MultimediaGstTools.so.5.14
+${PLIST.gst}qt5/lib/libQt5MultimediaGstTools.prl
+${PLIST.gst}qt5/lib/libQt5MultimediaGstTools.so
+${PLIST.gst}qt5/lib/libQt5MultimediaGstTools.so.${PKGVERSION}
+${PLIST.gst}qt5/lib/libQt5MultimediaGstTools.so.5
+${PLIST.gst}qt5/lib/libQt5MultimediaGstTools.so.5.14
qt5/lib/libQt5MultimediaQuick.prl
qt5/lib/libQt5MultimediaQuick.so
qt5/lib/libQt5MultimediaQuick.so.${PKGVERSION}
@@ -319,16 +319,16 @@ qt5/lib/pkgconfig/Qt5Multimedia.pc
qt5/lib/pkgconfig/Qt5MultimediaWidgets.pc
qt5/mkspecs/modules/qt_lib_multimedia.pri
qt5/mkspecs/modules/qt_lib_multimedia_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_multimediagsttools_private.pri
+${PLIST.gst}qt5/mkspecs/modules/qt_lib_multimediagsttools_private.pri
qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
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.unix}qt5/plugins/audio/libqtmedia_pulse.so
-${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.so
-${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.so
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.so
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.so
+${PLIST.pulse}qt5/plugins/audio/libqtmedia_pulse.so
+${PLIST.gst}qt5/plugins/mediaservice/libgstaudiodecoder.so
+${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
Added files:
Index: pkgsrc/x11/qt5-qtmultimedia/options.mk
diff -u /dev/null pkgsrc/x11/qt5-qtmultimedia/options.mk:1.1
--- /dev/null Thu Mar 5 12:32:40 2020
+++ pkgsrc/x11/qt5-qtmultimedia/options.mk Thu Mar 5 12:32:40 2020
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2020/03/05 12:32:40 nia Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qtmultimedia
+PKG_SUPPORTED_OPTIONS= alsa gstreamer openal pulseaudio
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS= alsa gstreamer openal pulseaudio
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa= yes
+MAKE_ENV+= QT_CONFIG+=alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+MAKE_ENV+= QT_CONFIG+=-alsa
+.endif
+
+PLIST_VARS+= gst
+.if !empty(PKG_OPTIONS:Mgstreamer)
+PLIST.gst= yes
+MAKE_ENV+= QT_CONFIG+=gstreamer-1.0
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.else
+MAKE_ENV+= QT_CONFIG+=-gstreamer-1.0
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenal)
+MAKE_ENV+= QT_CONFIG+=openal
+.include "../../audio/openal-soft/buildlink3.mk"
+.else
+MAKE_ENV+= QT_CONFIG+=-openal
+.endif
+
+PLIST_VARS+= pulse
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+PLIST.pulse= yes
+MAKE_ENV+= LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio
+MAKE_ENV+= QT_CONFIG+=pulseaudio
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+MAKE_ENV+= QT_CONFIG+=-pulseaudio
+.endif
Home |
Main Index |
Thread Index |
Old Index