Update to 5.15.1

7 files changed, 22 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7d306abe7cd..1fb1d4ef278c 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.15.0
+	pkgver = 5.15.1
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -11,21 +11,19 @@ pkgbase = mingw-w64-qt5-multimedia
 	license = custom
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
-	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
 	depends = mingw-w64-qt5-declarative
-	optdepends = mingw-w64-qt5-base-static: use of static libraries
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz
 	source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
 	source = 0002-Fix-build-with-ANGLE.patch
 	source = 0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
-	sha256sums = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
-	sha256sums = 805b5885d64ad1fa545683a30e82c44d6302903565c2b865d2f6dfe4e1cea5a3
-	sha256sums = dcaf467022057ea8020f758d483031df825c36497023cdab2b1ea31833e0a421
-	sha256sums = 6d627ffda55528876f92052528ab19f327486efafbb0c5a792191d216ade36ba
+	sha256sums = ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99
+	sha256sums = 98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569
+	sha256sums = 8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3
+	sha256sums = 63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40
 
 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 635394d70cbe..5d9c11306888 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 37467666ee75f39bd9b4811f6b539194377c8c46 Mon Sep 17 00:00:00 2001
+From 50c01edfba9e3aaf8c1713e04618de8020cf2a62 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:36:56 +0200
 Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf
@@ -37,5 +37,5 @@ index 12693e4f..f759a8f2 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.26.2
+2.28.0
 
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index ccb1fb613d2d..d03459ba3463 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From 13781a67c9ee7ccaa861ebba110ac740446c6edc Mon Sep 17 00:00:00 2001
+From b9604145623a990bb08eb460309e838684a692b1 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/3] Fix build with ANGLE
@@ -25,5 +25,5 @@ index d8e2da6d..41ef4d96 100644
  #endif
  
 -- 
-2.26.2
+2.28.0
 
diff --git a/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch b/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
index d464da610480..02a2f70cfbf1 100644
--- a/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
+++ b/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
@@ -1,4 +1,4 @@
-From 901bf854204cb2f9a4df9b9771183971f3c2f609 Mon Sep 17 00:00:00 2001
+From b29f98de79aed3c1905423ba6b1ebbb86eca29bb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 23 May 2020 15:43:20 +0200
 Subject: [PATCH 3/3] Workaround "multiple definition" errors with
@@ -26,5 +26,5 @@ index 27bb3abb..0cce6f20 100644
  
  include(common/common.pri)
 -- 
-2.26.2
+2.28.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 20f58be4d1c6..f4632c1a50ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,15 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# This file is created from PKGBUILD.sh.in contained by the mentioned repository.
+# This file is created from PKGBUILD.sh.ep contained by the mentioned repository.
 # Do not edit it manually! See README.md in the repository's root directory
 # for more information.
 
 # All patches are managed at https://github.com/Martchus/qtmultimedia
 
-# Includes dynamic and static versions; if only one version is requried, just
-# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
-
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.15.0
+pkgver=5.15.1
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -30,19 +27,14 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch'
         '0002-Fix-build-with-ANGLE.patch'
         '0003-Workaround-multiple-definition-errors-with-amstrmid-.patch')
-sha256sums=('0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7'
-            '805b5885d64ad1fa545683a30e82c44d6302903565c2b865d2f6dfe4e1cea5a3'
-            'dcaf467022057ea8020f758d483031df825c36497023cdab2b1ea31833e0a421'
-            '6d627ffda55528876f92052528ab19f327486efafbb0c5a792191d216ade36ba')
+sha256sums=('ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99'
+            '98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569'
+            '8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3'
+            '63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
-[[ $NO_STATIC_LIBS ]] || \
-  makedepends+=('mingw-w64-qt5-base-static') \
-  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
-  _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
-[[ $NO_SHARED_LIBS ]] || \
-  _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
+_configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 2e7b0b534f58..7174e9e9fdb9 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -4,10 +4,10 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.0
+pkgver=5.15.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')
+depends=(<%== qt5deps qw(base declarative) %>)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
diff --git a/qtmultimedia-sha256.txt b/qtmultimedia-sha256.txt
index ff78cfbd60a7..72f3c43681db 100644
--- a/qtmultimedia-sha256.txt
+++ b/qtmultimedia-sha256.txt
@@ -1 +1 @@
-0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
+ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99