5 files changed, 34 insertions, 149 deletions

diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
index 26e10def6e03..6d4a85ec23f3 100644
--- a/multimedia/qt5-multimedia/Makefile
+++ b/multimedia/qt5-multimedia/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	multimedia
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt5-
 
diff --git a/multimedia/qt5-multimedia/files/patch-git_1df147d5 b/multimedia/qt5-multimedia/files/patch-git_1df147d5
new file mode 100644
index 000000000000..5a0c1ad276e5
--- /dev/null
+++ b/multimedia/qt5-multimedia/files/patch-git_1df147d5
@@ -0,0 +1,26 @@
+From 1df147d5337622ea979eb1319c97d8278b70d864 Mon Sep 17 00:00:00 2001
+From: Ralf Nolden <nolden@kde.org>
+Date: Tue, 17 May 2016 12:47:59 +0200
+Subject: [PATCH] Make qtmultimedia 5.6 branch compile without c++11:nullptr
+ usage
+
+5.6 should not require c++11 features, however, nullptr slipped in here.
+Replace nullptr with Q_NULLPTR for initialization.
+
+Change-Id: Icf62618657b5bb725bd4c8f924853fa191f6e413
+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
+
+URL: https://codereview.qt-project.org/#/c/159342/
+--- src/gsttools/qgstreamerbushelper.cpp
++++ src/gsttools/qgstreamerbushelper.cpp
+@@ -52,7 +52,7 @@ public:
+         m_tag(0),
+         m_bus(bus),
+         m_helper(parent),
+-        m_intervalTimer(nullptr)
++        m_intervalTimer(Q_NULLPTR)
+     {
+         // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
+         QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
+-- 
+2.8.1
diff --git a/multimedia/qt5-multimedia/files/patch-git_3b322323 b/multimedia/qt5-multimedia/files/patch-git_3b322323
deleted file mode 100644
index 25b35d02e6d7..000000000000
--- a/multimedia/qt5-multimedia/files/patch-git_3b322323
+++ /dev/null
@@ -1,102 +0,0 @@
-commit 3b322323d036ae2fc9f685bfc74d1ebcd5532159
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Fri Nov 27 14:36:50 2015 +0100
-
-    alsa: Relax ALSA version checks for 1.1.x to be detected.
-
-    Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA
-    1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with
-    ALSA 1.1.
-
-    Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34
-    Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-
---- config.tests/alsa/alsatest.cpp
-+++ 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)))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
---- src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-+++ src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
-     QList<QByteArray> devices = availableDevices(mode);
- 
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         if (devices.size() > 0)
-             dev = QLatin1String(devices.first().constData());
-         else
-@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = device;
- #else
-         int idx = 0;
-@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const
-     snd_pcm_hw_params_t *params;
-     QString dev;
- 
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     dev = device;
-     if (dev.compare(QLatin1String("default")) == 0) {
-         QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
-@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
-     QList<QByteArray> devices;
-     QByteArray filter;
- 
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     // Create a list of all current audio devices that support mode
-     void **hints, **n;
-     char *name, *descr, *io;
---- src/plugins/alsa/qalsaaudioinput.cpp
-+++ src/plugins/alsa/qalsaaudioinput.cpp
-@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         if (devices.size() > 0)
-             dev = QLatin1String(devices.first());
-         else
-@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
---- src/plugins/alsa/qalsaaudiooutput.cpp
-+++ src/plugins/alsa/qalsaaudiooutput.cpp
-@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         if (devices.size() > 0)
-             dev = QLatin1String(devices.first());
-         else
-@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
diff --git a/multimedia/qt5-multimedia/files/patch-git_9047d9b b/multimedia/qt5-multimedia/files/patch-git_9047d9b
deleted file mode 100644
index f8c406cfb6d4..000000000000
--- a/multimedia/qt5-multimedia/files/patch-git_9047d9b
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 9047d9b84e9d94d193e77abd81f5980eff77d73a
-Author: Stephen Hurd <shurd@freebsd.org>
-Date:   Thu Apr 14 19:11:01 2016 -0700
-
-    ALSA: Call snd_pcm_drain() on suspend
-
-    The ALSA plugin previously didn't suspend the ALSA device when the
-    ::suspend() method is called.  This results in underrun errors when
-    it's resumed.
-
-    In ALSA, stopping a pcm doesn't close it, so the ALSA stop/start
-    functions map to the QAudioInput suspend/resume functions.
-
-    Change-Id: I2507065a1b7472af29eef70c531b9f6e8e5b3072
-    Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-
---- src/plugins/alsa/qalsaaudioinput.cpp
-+++ src/plugins/alsa/qalsaaudioinput.cpp
-@@ -701,6 +701,7 @@ qint64 QAlsaAudioInput::processedUSecs() const
- void QAlsaAudioInput::suspend()
- {
-     if(deviceState == QAudio::ActiveState||resuming) {
-+        snd_pcm_drain(handle);
-         timer->stop();
-         deviceState = QAudio::SuspendedState;
-         emit stateChanged(deviceState);
---- src/plugins/alsa/qalsaaudiooutput.cpp
-+++ src/plugins/alsa/qalsaaudiooutput.cpp
-@@ -673,6 +673,7 @@ QAudioFormat QAlsaAudioOutput::format() const
- void QAlsaAudioOutput::suspend()
- {
-     if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState || resuming) {
-+        snd_pcm_drain(handle);
-         timer->stop();
-         deviceState = QAudio::SuspendedState;
-         errorState = QAudio::NoError;
diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist
index 9f22bb2effe1..1046dff4ea98 100644
--- a/multimedia/qt5-multimedia/pkg-plist
+++ b/multimedia/qt5-multimedia/pkg-plist
@@ -48,11 +48,14 @@
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaserviceprovider_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmemoryvideobuffer_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsgvideonode_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_pulse_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaquickdefs_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfacegstsink_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
@@ -78,6 +81,7 @@
 %%QT_INCDIR%%/QtMultimedia/QAudioOutputSelectorControl
 %%QT_INCDIR%%/QtMultimedia/QAudioProbe
 %%QT_INCDIR%%/QtMultimedia/QAudioRecorder
+%%QT_INCDIR%%/QtMultimedia/QAudioRoleControl
 %%QT_INCDIR%%/QtMultimedia/QAudioSystemFactoryInterface
 %%QT_INCDIR%%/QtMultimedia/QAudioSystemPlugin
 %%QT_INCDIR%%/QtMultimedia/QCamera
@@ -172,6 +176,7 @@
 %%QT_INCDIR%%/QtMultimedia/qaudiooutputselectorcontrol.h
 %%QT_INCDIR%%/QtMultimedia/qaudioprobe.h
 %%QT_INCDIR%%/QtMultimedia/qaudiorecorder.h
+%%QT_INCDIR%%/QtMultimedia/qaudiorolecontrol.h
 %%QT_INCDIR%%/QtMultimedia/qaudiosystem.h
 %%QT_INCDIR%%/QtMultimedia/qaudiosystemplugin.h
 %%QT_INCDIR%%/QtMultimedia/qcamera.h
@@ -238,18 +243,12 @@
 %%QT_INCDIR%%/QtMultimedia/qvideowindowcontrol.h
 %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
 %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_RGB
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_Texture
-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_YUV
+%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_rgb_p.h
+%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_texture_p.h
+%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_yuv_p.h
 %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p
 %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
 %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
-%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_rgb.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_texture.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_yuv.h
 %%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
 %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
 %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qpaintervideosurface_p.h
@@ -333,5 +332,4 @@
 %%QT_QMLDIR%%/QtMultimedia/plugins.qmltypes
 %%QT_QMLDIR%%/QtMultimedia/qmldir
 libdata/pkgconfig/Qt5Multimedia.pc
-libdata/pkgconfig/Qt5MultimediaQuick_p.pc
 libdata/pkgconfig/Qt5MultimediaWidgets.pc