Re: x11/qt5-qtmultimedia featuring more files not in PLIST

[Michael Forney <mforney%mforney.org@localhost>]

Michael Forney <mforney%mforney.org@localhost> wrote:
> On 2020-11-16, Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost> wrote:
> > another Qt5 issue. I got some files that are not in PLIST, on CentOS 7:
> >
> > diff -ruN -x CVS pkgsrc-2020Q3/x11/qt5-qtmultimedia/PLIST
> > pkgsrc/x11/qt5-qtmultimedia/PLIST
> > --- pkgsrc-2020Q3/x11/qt5-qtmultimedia/PLIST    2020-07-05
> > 03:12:14.000000000 +0200
> > +++ pkgsrc/x11/qt5-qtmultimedia/PLIST   2020-11-16 16:04:37.754777457 +0100
> > @@ -337,3 +337,5 @@
> >  qt5/qml/QtMultimedia/libdeclarative_multimedia.so
> >  qt5/qml/QtMultimedia/plugins.qmltypes
> >  qt5/qml/QtMultimedia/qmldir
> > +qt5/plugins/mediaservice/libqtmedia_audioengine.so
> > +qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
> >
> > Any opinions on that? Wo else got 'em?
> 
> I have these files, too, and made a similar change to the PLIST in my
> local pkgsrc clone. I hadn't gone through the source yet to figure out
> exactly what condition causes them to be built in order to match that
> logic in pkgsrc.
> 
> Since we are both on Linux, it could be related to that. I will do
> some investigation.

The conditionals used to control whether this plugin is built are in
https://github.com/qt/qtmultimedia/blob/v5.15.1/src/plugins/plugins.pro

Whenever the audiocapture subdir is added, the plugin is enabled.
For pkgsrc, this can be translated to

.if ${OPSYS} == "QNX" || ${OPSYS} == "Darwin" || empty(PKG_OPTIONS:Mgstreamer)

This means that the PLIST issue is not specific to Linux, but appears
on other platforms as well when gstreamer is disabled. I verified
the issue in a NetBSD VM when I disabled gstreamer.

Here is my proposed patch. Can you verify that this works for you?

diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 7814d351805..683c6016c39 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -282,6 +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.audioengine}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.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
@@ -324,6 +325,7 @@ 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.audioengine}qt5/plugins/mediaservice/libqtmedia_audioengine.so
 ${PLIST.pulse}qt5/plugins/audio/libqtmedia_pulse.so
 ${PLIST.gst}qt5/plugins/mediaservice/libgstaudiodecoder.so
 ${PLIST.gst}qt5/plugins/mediaservice/libgstcamerabin.so
diff --git a/x11/qt5-qtmultimedia/PLIST.Darwin b/x11/qt5-qtmultimedia/PLIST.Darwin
index 3420af7eba1..637e4673e48 100644
--- a/x11/qt5-qtmultimedia/PLIST.Darwin
+++ b/x11/qt5-qtmultimedia/PLIST.Darwin
@@ -1,9 +1,7 @@
 @comment $NetBSD: PLIST.Darwin,v 1.2 2020/01/21 20:25:38 adam Exp $
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFMediaPlayerServicePlugin.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFServicePlugin.cmake
-qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake
 qt5/plugins/audio/libqtaudio_coreaudio.so
 qt5/plugins/mediaservice/libqavfcamera.so
 qt5/plugins/mediaservice/libqavfmediaplayer.so
-qt5/plugins/mediaservice/libqtmedia_audioengine.so
diff --git a/x11/qt5-qtmultimedia/options.mk b/x11/qt5-qtmultimedia/options.mk
index de8215c6b2c..b9226e93de0 100644
--- a/x11/qt5-qtmultimedia/options.mk
+++ b/x11/qt5-qtmultimedia/options.mk
@@ -50,3 +50,8 @@ MAKE_ENV+=	QT_CONFIG+=pulseaudio
 .else
 MAKE_ENV+=	QT_CONFIG+=-pulseaudio
 .endif
+
+PLIST_VARS+=		audioengine
+.if ${OPSYS} == "QNX" || ${OPSYS} == "Darwin" || empty(PKG_OPTIONS:Mgstreamer)
+PLIST.audioengine=	yes
+.endif