Update to 5.12.0

6 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1ca05744fe2..d4cc1370a427 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.2
+	pkgver = 5.12.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -18,16 +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.2/submodules/qtmultimedia-everywhere-src-5.11.2.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.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 = 25608f3d08636026387394956fe72cedcb78eb786fb32fd87deb41d574cf726d
-	sha256sums = 469c56df10377766660434b34b5d2fc61be8af9dc29e5a9e412a25590116428b
-	sha256sums = c00c3bbc67ef43c6e208ead350b2ecb810c389eafb790a3dfc801f2cc1348608
-	sha256sums = 6aaf06c55c8ed2c8b57a181ae9e220196d84c4ff6192a5a7bbe1b62ef0eca1dc
-	sha256sums = e6cbde9818e262def880eefbe3c3fb8e2f891b84a620c358a84599170d83d77c
+	sha256sums = 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9
+	sha256sums = 9b850e7935796703c68031d09b7c58300b53ad7003544fe22a73360c3fc5168c
+	sha256sums = ef112eb53b2dc399a247697b42507c36408dcdc2328ecd64376be8785e04ae33
+	sha256sums = f7acda17ae90e2a099ac6388058b3b34f21fd0b1f6aba39dc9757a7ed36e326f
+	sha256sums = c700a540a7f163802a20d6d5bb822845a7d8e5d1067833e2f3938c97cd45ce6f
 
 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 971abff62c1c..fa609e5ce78e 100644
--- a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
+++ b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
@@ -1,4 +1,4 @@
-From 296025ffe040546d0b5e1f8736eaeda9f855cf6e Mon Sep 17 00:00:00 2001
+From 6586254a5bfb008f6affddf251c74bd930c4161a 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
@@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.19.0
+2.19.2
 
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index 8a690acedf8a..810c60033874 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From 79d90ae200860053f072b52e508bc0259c8070ca Mon Sep 17 00:00:00 2001
+From ed8494f4408d4ddb535e1d12d1151127e15a0b55 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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/4] Fix build with ANGLE
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp
-index 54403fab..9132b3d8 100644
+index ab694b79..79fd34be 100644
 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp
 +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp
 @@ -50,9 +50,9 @@
@@ -25,5 +25,5 @@ index 54403fab..9132b3d8 100644
  #endif
  
 -- 
-2.19.0
+2.19.2
 
diff --git a/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch b/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
index 18d763ce2680..e9481c0eddf7 100644
--- a/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
+++ b/0003-Prevent-redefinition-of-MFVideoNormalizedRect.patch
@@ -1,10 +1,12 @@
-From ca9c6831d839d8b79df6d74c038e32c39e35cc17 Mon Sep 17 00:00:00 2001
+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 compatiblity with MinGW-w64 headers 6.0
+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(-)
@@ -23,5 +25,5 @@ index f898209b..a8d7f664 100644
      float left;
      float top;
 -- 
-2.19.0
+2.19.2
 
diff --git a/0004-Link-directshow-plugin-against-libamstrmid.patch b/0004-Link-directshow-plugin-against-libamstrmid.patch
index 65b33ff75ff6..b14a1ef83fac 100644
--- a/0004-Link-directshow-plugin-against-libamstrmid.patch
+++ b/0004-Link-directshow-plugin-against-libamstrmid.patch
@@ -1,4 +1,4 @@
-From da4ad130740aabeeeda441c9eb81d6810d3da582 Mon Sep 17 00:00:00 2001
+From 4ca58055892ae0273488913f998c47a7aaaa521f 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
@@ -28,5 +28,5 @@ index 54d61716..e097d433 100644
  SOURCES += dsserviceplugin.cpp
  
 -- 
-2.19.0
+2.19.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 9713440fee72..c4980ef042a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.11.2
+pkgver=5.12.0
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -26,11 +26,11 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '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')
+sha256sums=('5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9'
+            '9b850e7935796703c68031d09b7c58300b53ad7003544fe22a73360c3fc5168c'
+            'ef112eb53b2dc399a247697b42507c36408dcdc2328ecd64376be8785e04ae33'
+            'f7acda17ae90e2a099ac6388058b3b34f21fd0b1f6aba39dc9757a7ed36e326f'
+            'c700a540a7f163802a20d6d5bb822845a7d8e5d1067833e2f3938c97cd45ce6f')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \