Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt5-qtmultimedia/Makefile,v retrieving revision 1.56 diff -p -u -r1.56 Makefile --- Makefile 5 Nov 2019 14:58:45 -0000 1.56 +++ Makefile 7 Dec 2019 23:09:18 -0000 @@ -11,16 +11,14 @@ 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+= pulseaudio + PLIST_VARS+= alsa .if ${OPSYS} == "Linux" .include "../../audio/alsa-lib/buildlink3.mk" @@ -29,7 +27,6 @@ PLIST.alsa= yes .if ${OPSYS} != "Darwin" .include "../../audio/openal-soft/buildlink3.mk" -.include "../../audio/pulseaudio/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" .endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt5-qtmultimedia/PLIST,v retrieving revision 1.17 diff -p -u -r1.17 PLIST --- PLIST 16 Sep 2019 19:24:54 -0000 1.17 +++ PLIST 7 Dec 2019 23:09:18 -0000 @@ -293,7 +293,7 @@ ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake -${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake +${PLIST.pulseaudio}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake ${PLIST.unix}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake qt5/lib/cmake/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake @@ -329,7 +329,7 @@ qt5/mkspecs/modules/qt_lib_multimediawid 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.pulseaudio}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 Index: buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk,v retrieving revision 1.37 diff -p -u -r1.37 buildlink3.mk --- buildlink3.mk 3 Nov 2019 09:14:16 -0000 1.37 +++ buildlink3.mk 7 Dec 2019 23:09:18 -0000 @@ -15,10 +15,17 @@ BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5 .if ${OPSYS} != "Darwin" .include "../../audio/openal-soft/buildlink3.mk" -.include "../../audio/pulseaudio/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" .endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" + +pkgbase := qt5-qtmultimedia +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_OPTIONS:Mpulseaudio) +.include "../../audio/pulseaudio/buildlink3.mk" +.endif + .endif # QT5_QTMULTIMEDIA_BUILDLINK3_MK BUILDLINK_TREE+= -qt5-qtmultimedia Index: options.mk =================================================================== RCS file: options.mk diff -N options.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ options.mk 7 Dec 2019 23:09:18 -0000 @@ -0,0 +1,19 @@ +# $NetBSD$ + +PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qtmultimedia +PKG_SUPPORTED_OPTIONS= +PKG_SUGGESTED_OPTIONS= + +.if ${OPSYS} != "Darwin" + +PKG_SUPPORTED_OPTIONS+= pulseaudio +PKG_SUGGESTED_OPTIONS+= pulseaudio + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpulseaudio) +.include "../../audio/pulseaudio/buildlink3.mk" +MAKE_ENV+= LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio +.endif + +.endif