Update to 5.12.1

6 files changed, 24 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14ab8ec61950..2ab8eb95b212 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-qt5-multimedia
 	pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64)
-	pkgver = 5.12.0
-	pkgrel = 2
+	pkgver = 5.12.1
+	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt5
@@ -18,16 +18,14 @@ pkgbase = mingw-w64-qt5-multimedia
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtmultimedia-everywhere-src-5.12.1.tar.xz
 	source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
 	source = 0002-Fix-build-with-ANGLE.patch
-	source = 0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
-	source = 0004-Link-directshow-plugin-against-libamstrmid.patch
-	sha256sums = 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9
-	sha256sums = 9b850e7935796703c68031d09b7c58300b53ad7003544fe22a73360c3fc5168c
-	sha256sums = ef112eb53b2dc399a247697b42507c36408dcdc2328ecd64376be8785e04ae33
-	sha256sums = f7acda17ae90e2a099ac6388058b3b34f21fd0b1f6aba39dc9757a7ed36e326f
-	sha256sums = c700a540a7f163802a20d6d5bb822845a7d8e5d1067833e2f3938c97cd45ce6f
+	source = 0003-Link-directshow-plugin-against-libamstrmid.patch
+	sha256sums = 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18
+	sha256sums = dfeb1cfac258612f5d7ccf56443722931d0a88d46f98d08b9d8631fd7aa42cea
+	sha256sums = a8056811f803dedcf8175029b9f5e5ea47893faa388c6c398d74461580ce29ef
+	sha256sums = 4571f18a7d48ad1454c2d509c8dc111d67cd3c137011d7709fb04a0e7c280db7
 
 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 fa609e5ce78e..bd7bab05aec6 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 6586254a5bfb008f6affddf251c74bd930c4161a Mon Sep 17 00:00:00 2001
+From 2fe08c97f5832ffb51876908ee85ef09602148ba Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:36:56 +0200
-Subject: [PATCH 1/4] Recorder includes to prevent conflict with vsnprintf
+Subject: [PATCH 1/3] 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.19.2
+2.20.1
 
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index 810c60033874..406f453f542b 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,7 +1,7 @@
-From ed8494f4408d4ddb535e1d12d1151127e15a0b55 Mon Sep 17 00:00:00 2001
+From 6c827291b2a23f06379588ea10f6cd0f0d6aee8e 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/4] Fix build with ANGLE
+Subject: [PATCH 2/3] Fix build with ANGLE
 
 ---
  src/plugins/common/evr/evrd3dpresentengine.cpp | 6 +++---
@@ -25,5 +25,5 @@ index ab694b79..79fd34be 100644
  #endif
  
 -- 
-2.19.2
+2.20.1
 
diff --git a/0004-Link-directshow-plugin-against-libamstrmid.patch b/0003-Link-directshow-plugin-against-libamstrmid.patch
index b14a1ef83fac..a31124894067 100644
--- a/0004-Link-directshow-plugin-against-libamstrmid.patch
+++ b/0003-Link-directshow-plugin-against-libamstrmid.patch
@@ -1,7 +1,7 @@
-From 4ca58055892ae0273488913f998c47a7aaaa521f Mon Sep 17 00:00:00 2001
+From c0ecd0c32825a3c653898bc05773532f70ba3fde 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
+Subject: [PATCH 3/3] Link directshow plugin against libamstrmid
 
 Fixes errors about undefined references to IID_IMFVideoDeviceID,
 IID_IMFVideoPresenter, IID_IMFTopologyServiceLookupClient and
@@ -28,5 +28,5 @@ index 54d61716..e097d433 100644
  SOURCES += dsserviceplugin.cpp
  
 -- 
-2.19.2
+2.20.1
 
diff --git a/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch b/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
deleted file mode 100644
index e9481c0eddf7..000000000000
--- a/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ab9f339dd836ece1b4b1c220b6fe6888852a8694 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 compatibility with MinGW-w64 headers 6.0
-where MFVideoNormalizedRect has been added to evr.h.
-
-Change-Id: Id4edec36c6bc9c50cadbeacc436382940973475c
----
- 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.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 06b40de43edc..fbf865c9198b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.12.0
-pkgrel=2
+pkgver=5.12.1
+pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
@@ -24,13 +24,11 @@ _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'
-        '0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch'
-        '0004-Link-directshow-plugin-against-libamstrmid.patch')
-sha256sums=('5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9'
-            '9b850e7935796703c68031d09b7c58300b53ad7003544fe22a73360c3fc5168c'
-            'ef112eb53b2dc399a247697b42507c36408dcdc2328ecd64376be8785e04ae33'
-            'f7acda17ae90e2a099ac6388058b3b34f21fd0b1f6aba39dc9757a7ed36e326f'
-            'c700a540a7f163802a20d6d5bb822845a7d8e5d1067833e2f3938c97cd45ce6f')
+        '0003-Link-directshow-plugin-against-libamstrmid.patch')
+sha256sums=('9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18'
+            'dfeb1cfac258612f5d7ccf56443722931d0a88d46f98d08b9d8631fd7aa42cea'
+            'a8056811f803dedcf8175029b9f5e5ea47893faa388c6c398d74461580ce29ef'
+            '4571f18a7d48ad1454c2d509c8dc111d67cd3c137011d7709fb04a0e7c280db7')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \