Update to 5.11.2

6 files changed, 83 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca55414410c0..a1ca05744fe2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-multimedia
 	pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64)
-	pkgver = 5.11.1
+	pkgver = 5.11.2
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -18,12 +18,16 @@ pkgbase = mingw-w64-qt5-multimedia
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtmultimedia-everywhere-src-5.11.2.tar.xz
 	source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
 	source = 0002-Fix-build-with-ANGLE.patch
-	sha256sums = f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c
-	sha256sums = 2818f84cd4a00222517a2192702c5341bfd65dafaa330859a8a0c8ff6b4f03bb
-	sha256sums = 7ec08be14199f3eed6e851673ceeeecf063926498823d415304f495ccfe9d890
+	source = 0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
+	source = 0004-Link-directshow-plugin-against-libamstrmid.patch
+	sha256sums = 25608f3d08636026387394956fe72cedcb78eb786fb32fd87deb41d574cf726d
+	sha256sums = 469c56df10377766660434b34b5d2fc61be8af9dc29e5a9e412a25590116428b
+	sha256sums = c00c3bbc67ef43c6e208ead350b2ecb810c389eafb790a3dfc801f2cc1348608
+	sha256sums = 6aaf06c55c8ed2c8b57a181ae9e220196d84c4ff6192a5a7bbe1b62ef0eca1dc
+	sha256sums = e6cbde9818e262def880eefbe3c3fb8e2f891b84a620c358a84599170d83d77c
 
 pkgname = mingw-w64-qt5-multimedia
 
diff --git a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
index 2206a3fa0268..971abff62c1c 100644
--- a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
+++ b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
@@ -1,7 +1,7 @@
-From ce9491d330b55c184f62d676dabc66fa318fd675 Mon Sep 17 00:00:00 2001
+From 296025ffe040546d0b5e1f8736eaeda9f855cf6e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:36:56 +0200
-Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf
+Subject: [PATCH 1/4] Recorder includes to prevent conflict with vsnprintf
 
 Some files #include <dshow.h>
 This is a C header which also #include's stdio.h which adds a #define vsnprintf
@@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.18.0
+2.19.0
 
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index eeecaa2c18d8..8a690acedf8a 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,7 +1,7 @@
-From 685ae2e8299be0e0528b98b0244df17ac8eb157a Mon Sep 17 00:00:00 2001
+From 79d90ae200860053f072b52e508bc0259c8070ca Mon Sep 17 00:00:00 2001
 From: Jose Santiago <jsantiago@haivision.com>
 Date: Thu, 3 Nov 2016 14:36:10 -0500
-Subject: [PATCH 2/2] Fix build with ANGLE
+Subject: [PATCH 2/4] Fix build with ANGLE
 
 ---
  src/plugins/common/evr/evrd3dpresentengine.cpp | 6 +++---
@@ -25,5 +25,5 @@ index 54403fab..9132b3d8 100644
  #endif
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch b/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
new file mode 100644
index 000000000000..18d763ce2680
--- /dev/null
+++ b/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
@@ -0,0 +1,27 @@
+From ca9c6831d839d8b79df6d74c038e32c39e35cc17 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Mon, 24 Sep 2018 19:21:40 +0200
+Subject: [PATCH 3/4] Prevent redefinition of MFVideoNormalizedRect
+
+This establishes compatiblity with MinGW-w64 headers 6.0
+where MFVideoNormalizedRect has been added to evr.h.
+---
+ src/plugins/common/evr/evrdefs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
+index f898209b..a8d7f664 100644
+--- a/src/plugins/common/evr/evrdefs.h
++++ b/src/plugins/common/evr/evrdefs.h
+@@ -83,7 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
+ #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L)
+ #endif
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(_MFVideoNormalizedRect_)
+ typedef struct MFVideoNormalizedRect {
+     float left;
+     float top;
+-- 
+2.19.0
+
diff --git a/0004-Link-directshow-plugin-against-libamstrmid.patch b/0004-Link-directshow-plugin-against-libamstrmid.patch
new file mode 100644
index 000000000000..65b33ff75ff6
--- /dev/null
+++ b/0004-Link-directshow-plugin-against-libamstrmid.patch
@@ -0,0 +1,32 @@
+From da4ad130740aabeeeda441c9eb81d6810d3da582 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Mon, 24 Sep 2018 20:10:19 +0200
+Subject: [PATCH 4/4] Link directshow plugin against libamstrmid
+
+Fixes errors about undefined references to IID_IMFVideoDeviceID,
+IID_IMFVideoPresenter, IID_IMFTopologyServiceLookupClient and
+IID_IMFTopologyServiceLookupClient when building dsengine.dll.
+---
+ src/plugins/directshow/directshow.pro | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
+index 54d61716..e097d433 100644
+--- a/src/plugins/directshow/directshow.pro
++++ b/src/plugins/directshow/directshow.pro
+@@ -5,6 +5,12 @@ win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) {
+     LIBS_PRIVATE += -lgdi32 -luser32
+ }
+ 
++# add library containing IID_IMFVideoDeviceID, IID_IMFVideoPresenter, IID_IMFTopologyServiceLookupClient
++# and IID_IMFTopologyServiceLookupClient
++mingw {
++    LIBS_PRIVATE += -lamstrmid
++}
++
+ HEADERS += dsserviceplugin.h
+ SOURCES += dsserviceplugin.cpp
+ 
+-- 
+2.19.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 813286baf4cb..9713440fee72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.11.1
+pkgver=5.11.2
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -23,10 +23,14 @@ url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch'
-        '0002-Fix-build-with-ANGLE.patch')
-sha256sums=('f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c'
-            '2818f84cd4a00222517a2192702c5341bfd65dafaa330859a8a0c8ff6b4f03bb'
-            '7ec08be14199f3eed6e851673ceeeecf063926498823d415304f495ccfe9d890')
+        '0002-Fix-build-with-ANGLE.patch'
+        '0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch'
+        '0004-Link-directshow-plugin-against-libamstrmid.patch')
+sha256sums=('25608f3d08636026387394956fe72cedcb78eb786fb32fd87deb41d574cf726d'
+            '469c56df10377766660434b34b5d2fc61be8af9dc29e5a9e412a25590116428b'
+            'c00c3bbc67ef43c6e208ead350b2ecb810c389eafb790a3dfc801f2cc1348608'
+            '6aaf06c55c8ed2c8b57a181ae9e220196d84c4ff6192a5a7bbe1b62ef0eca1dc'
+            'e6cbde9818e262def880eefbe3c3fb8e2f891b84a620c358a84599170d83d77c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \