qt5: update to 5.10.0

2+ years worth of bug fixes and feature enhancements

7 files changed, 71 insertions, 95 deletions

diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index b3438fcac6e..c29d07e70e9 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/17 19:30:47 markd Exp $
 
-DISTNAME=	qtmultimedia-opensource-src-${QTVERSION}
+DISTNAME=	qtmultimedia-everywhere-src-${QTVERSION}
 PKGNAME=	qt5-qtmultimedia-${QTVERSION}
-PKGREVISION=	13
 COMMENT=	Qt5 module for multimedia
 
 BUILD_TARGET=		sub-src
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 44027fc855c..77fc3e30cf4 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/01/17 19:30:47 markd Exp $
 lib/pkgconfig/Qt5Multimedia.pc
 lib/pkgconfig/Qt5MultimediaQuick_p.pc
 lib/pkgconfig/Qt5MultimediaWidgets.pc
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/gstvideoconnector_p.h
-qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/playlistfileparser_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiobuffer_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodevicefactory_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiohelpers_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiosystempluginext_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qcamera_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_p.h
@@ -18,7 +18,6 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioinput
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbufferprobe_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbushelper_p.h
-qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamergltexturerenderer_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermessage_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermirtexturerenderer_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
@@ -28,6 +27,7 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorende
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorendererinterface_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowidget_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowindow_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgsttools_global_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstutils_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideobuffer_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideorendererplugin_p.h
@@ -52,11 +52,17 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaservice_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaserviceprovider_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediastoragelocation_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmemoryvideobuffer_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmultimediautils_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplaylistfileparser_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsamplecache_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsgvideonode_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsoundeffect_pulse_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsoundeffect_qaudio_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimedia-config_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaglobal_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaquickdefs_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframe_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframeconversionhelper_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideooutputorientationhandler_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideosurfacegstsink_p.h
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideosurfaceoutput_p.h
@@ -82,6 +88,7 @@ qt5/include/QtMultimedia/QAudioOutput
 qt5/include/QtMultimedia/QAudioOutputSelectorControl
 qt5/include/QtMultimedia/QAudioProbe
 qt5/include/QtMultimedia/QAudioRecorder
+qt5/include/QtMultimedia/QAudioRoleControl
 qt5/include/QtMultimedia/QAudioSystemFactoryInterface
 qt5/include/QtMultimedia/QAudioSystemPlugin
 qt5/include/QtMultimedia/QCamera
@@ -176,6 +183,7 @@ qt5/include/QtMultimedia/qaudiooutput.h
 qt5/include/QtMultimedia/qaudiooutputselectorcontrol.h
 qt5/include/QtMultimedia/qaudioprobe.h
 qt5/include/QtMultimedia/qaudiorecorder.h
+qt5/include/QtMultimedia/qaudiorolecontrol.h
 qt5/include/QtMultimedia/qaudiosystem.h
 qt5/include/QtMultimedia/qaudiosystemplugin.h
 qt5/include/QtMultimedia/qcamera.h
@@ -231,7 +239,9 @@ qt5/include/QtMultimedia/qradiotuner.h
 qt5/include/QtMultimedia/qradiotunercontrol.h
 qt5/include/QtMultimedia/qsound.h
 qt5/include/QtMultimedia/qsoundeffect.h
+qt5/include/QtMultimedia/qtmultimedia-config.h
 qt5/include/QtMultimedia/qtmultimediadefs.h
+qt5/include/QtMultimedia/qtmultimediaglobal.h
 qt5/include/QtMultimedia/qtmultimediaversion.h
 qt5/include/QtMultimedia/qvideodeviceselectorcontrol.h
 qt5/include/QtMultimedia/qvideoencodersettingscontrol.h
@@ -240,22 +250,19 @@ qt5/include/QtMultimedia/qvideoprobe.h
 qt5/include/QtMultimedia/qvideorenderercontrol.h
 qt5/include/QtMultimedia/qvideosurfaceformat.h
 qt5/include/QtMultimedia/qvideowindowcontrol.h
-qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
-qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_RGB
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_Texture
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_YUV
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_p
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
-qt5/include/QtMultimediaQuick_p/qsgvideonode_rgb.h
-qt5/include/QtMultimediaQuick_p/qsgvideonode_texture.h
-qt5/include/QtMultimediaQuick_p/qsgvideonode_yuv.h
-qt5/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
-qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
+qt5/include/QtMultimediaGstTools/QtMultimediaGstTools
+qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsDepends
+qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsVersion
+qt5/include/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_rgb_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_texture_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_yuv_p.h
+qt5/include/QtMultimediaQuick/QtMultimediaQuick
+qt5/include/QtMultimediaQuick/QtMultimediaQuickDepends
+qt5/include/QtMultimediaQuick/QtMultimediaQuickVersion
+qt5/include/QtMultimediaQuick/qtmultimediaquickversion.h
 qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qpaintervideosurface_p.h
 qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qvideowidget_p.h
 qt5/include/QtMultimediaWidgets/QCameraViewfinder
@@ -276,8 +283,8 @@ qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFMediaPlayerServicePlugin.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFServicePlugin.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
-${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
+${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.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
@@ -286,37 +293,45 @@ qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
 qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
 qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake
-qt5/lib/libQt5Multimedia.la
 qt5/lib/libQt5Multimedia.prl
-qt5/lib/libQt5MultimediaQuick_p.la
-qt5/lib/libQt5MultimediaQuick_p.prl
-qt5/lib/libQt5MultimediaWidgets.la
+qt5/lib/libQt5Multimedia.so
+qt5/lib/libQt5Multimedia.so.${PKGVERSION}
+qt5/lib/libQt5Multimedia.so.5
+qt5/lib/libQt5Multimedia.so.5.10
+qt5/lib/libQt5MultimediaGstTools.prl
+qt5/lib/libQt5MultimediaGstTools.so
+qt5/lib/libQt5MultimediaGstTools.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaGstTools.so.5
+qt5/lib/libQt5MultimediaGstTools.so.5.10
+qt5/lib/libQt5MultimediaQuick.prl
+qt5/lib/libQt5MultimediaQuick.so
+qt5/lib/libQt5MultimediaQuick.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaQuick.so.5
+qt5/lib/libQt5MultimediaQuick.so.5.10
 qt5/lib/libQt5MultimediaWidgets.prl
-${PLIST.unix}qt5/lib/libqgsttools_p.la
-${PLIST.unix}qt5/lib/libqgsttools_p.prl
+qt5/lib/libQt5MultimediaWidgets.so
+qt5/lib/libQt5MultimediaWidgets.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaWidgets.so.5
+qt5/lib/libQt5MultimediaWidgets.so.5.10
 qt5/lib/pkgconfig/Qt5Multimedia.pc
-qt5/lib/pkgconfig/Qt5MultimediaQuick_p.pc
 qt5/lib/pkgconfig/Qt5MultimediaWidgets.pc
 qt5/mkspecs/modules/qt_lib_multimedia.pri
 qt5/mkspecs/modules/qt_lib_multimedia_private.pri
+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.la
-${PLIST.mac}qt5/plugins/audio/libqtaudio_coreaudio.la
-${PLIST.mac}qt5/plugins/mediaservice/libqavfcamera.la
-${PLIST.mac}qt5/plugins/mediaservice/libqavfmediaplayer.la
-${PLIST.mac}qt5/plugins/mediaservice/libqtmedia_audioengine.la
-${PLIST.unix}qt5/plugins/audio/libqtmedia_pulse.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.la
-qt5/plugins/playlistformats/libqtmultimedia_m3u.la
-qt5/qml/QtAudioEngine/libdeclarative_audioengine.la
+${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
+qt5/plugins/playlistformats/libqtmultimedia_m3u.so
+qt5/qml/QtAudioEngine/libdeclarative_audioengine.so
 qt5/qml/QtAudioEngine/plugins.qmltypes
 qt5/qml/QtAudioEngine/qmldir
 qt5/qml/QtMultimedia/Video.qml
-qt5/qml/QtMultimedia/libdeclarative_multimedia.la
+qt5/qml/QtMultimedia/libdeclarative_multimedia.so
 qt5/qml/QtMultimedia/plugins.qmltypes
 qt5/qml/QtMultimedia/qmldir
diff --git a/x11/qt5-qtmultimedia/PLIST.Darwin b/x11/qt5-qtmultimedia/PLIST.Darwin
new file mode 100644
index 00000000000..b9e654b19fc
--- /dev/null
+++ b/x11/qt5-qtmultimedia/PLIST.Darwin
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/01/17 19:30:47 markd Exp $
+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/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk
index 7ffe9df3661..455a749684d 100644
--- a/x11/qt5-qtmultimedia/buildlink3.mk
+++ b/x11/qt5-qtmultimedia/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/17 19:30:47 markd Exp $
 
 BUILDLINK_TREE+=	qt5-qtmultimedia
 
 .if !defined(QT5_QTMULTIMEDIA_BUILDLINK3_MK)
 QT5_QTMULTIMEDIA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtmultimedia+=	qt5-qtmultimedia>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+=	qt5-qtmultimedia>=5.5.1nb13
-BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?=		../../x11/qt5-qtmultimedia
+BUILDLINK_API_DEPENDS.qt5-qtmultimedia+=	qt5-qtmultimedia>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+=	qt5-qtmultimedia>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?=	../../x11/qt5-qtmultimedia
 
 BUILDLINK_INCDIRS.qt5-qtmultimedia+=	qt5/include
 BUILDLINK_LIBDIRS.qt5-qtmultimedia+=	qt5/lib
diff --git a/x11/qt5-qtmultimedia/distinfo b/x11/qt5-qtmultimedia/distinfo
index 3fb11a0006d..f6036c009c8 100644
--- a/x11/qt5-qtmultimedia/distinfo
+++ b/x11/qt5-qtmultimedia/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/07/16 00:37:44 markd Exp $
+$NetBSD: distinfo,v 1.4 2018/01/17 19:30:47 markd Exp $
 
-SHA1 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 734cdbd0c365ccdf958ad8957e2a8f86492425b7
-RMD160 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 68049da5e203e484de766c17d683a34a888e0603
-SHA512 (qtmultimedia-opensource-src-5.5.1.tar.xz) = e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0
-Size (qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340 bytes
-SHA1 (patch-config.tests_alsa_alsatest.cpp) = 8215d32c1bf08610507aea9878a96dfdcbb568b4
-SHA1 (patch-qtmultimedia.pro) = 70ef4ab962f117a7539c352bc5467ae057524a8a
+SHA1 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 28717fd66e92dbf7f17ad17aab1344d3609111f1
+RMD160 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = ac464e9289e75bb72134f452d1aaf10db7cfd316
+SHA512 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 43838d5d09728388d8a4e62aeaea242479b76a1fbe31afbf9260538135e37b15114ef29e13bcd1c7698b0798161e740f79606abf9a475f39f77da379e7b0e98f
+Size (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 3654312 bytes
diff --git a/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp b/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp
deleted file mode 100644
index 500d611d34b..00000000000
--- a/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-config.tests_alsa_alsatest.cpp,v 1.1 2016/07/16 00:37:45 markd Exp $
-
-Allow newer Alsa versions.
-
---- config.tests/alsa/alsatest.cpp.orig	2015-10-13 04:35:43.000000000 +0000
-+++ config.tests/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10) && !(SND_LIB_MAJOR == 1 && SND_LIB_MINOR >= 1))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
diff --git a/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro b/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro
deleted file mode 100644
index abddb568a56..00000000000
--- a/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-qtmultimedia.pro,v 1.1 2015/10/26 19:04:00 adam Exp $
-
-Try to configure audio modules, despite QT_CONFIG set in qt5-qtbase.
-
---- qtmultimedia.pro.orig	2015-10-26 17:52:59.000000000 +0000
-+++ qtmultimedia.pro
-@@ -15,16 +15,10 @@ win32 {
- } else:qnx {
-     qtCompileTest(mmrenderer)
- } else:!android {
--    contains(QT_CONFIG, alsa):qtCompileTest(alsa)
--    contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
-+    qtCompileTest(alsa)
-+    qtCompileTest(pulseaudio)
- 
--    isEmpty(GST_VERSION) {
--        contains(QT_CONFIG, gstreamer-0.10) {
--            GST_VERSION = 0.10
--        } else: contains(QT_CONFIG, gstreamer-1.0) {
--            GST_VERSION = 1.0
--        }
--    }
-+    GST_VERSION = 1.0
-     cache(GST_VERSION, set)
-     !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
-         qtCompileTest(gstreamer_photography)