summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch4
-rw-r--r--0002-Fix-build-with-ANGLE.patch4
-rw-r--r--0003-Workaround-multiple-definition-errors-with-amstrmid-.patch4
-rw-r--r--PKGBUILD10
-rw-r--r--qtmultimedia-sha256.txt2
6 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d53b7ad2821..08447c42c5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-multimedia-static
pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64)
- pkgver = 5.15.1
+ pkgver = 5.15.2
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -17,14 +17,14 @@ pkgbase = mingw-w64-qt5-multimedia-static
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.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 = ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99
- sha256sums = 98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569
- sha256sums = 8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3
- sha256sums = 63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40
+ sha256sums = 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
+ sha256sums = 36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399
+ sha256sums = b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064
+ sha256sums = 5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5
pkgname = mingw-w64-qt5-multimedia-static
diff --git a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
index 5d9c1130688..4b99a9751b8 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 50c01edfba9e3aaf8c1713e04618de8020cf2a62 Mon Sep 17 00:00:00 2001
+From 7499d7437e923b35e2f8355c1f5bf355ddc81096 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.28.0
+2.29.2
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index d03459ba346..0564c063f04 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From b9604145623a990bb08eb460309e838684a692b1 Mon Sep 17 00:00:00 2001
+From 4bbba7b3a80982ad0f4d3216d949d087ae9dbf00 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.28.0
+2.29.2
diff --git a/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch b/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
index 02a2f70cfbf..d6731d63b77 100644
--- a/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
+++ b/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch
@@ -1,4 +1,4 @@
-From b29f98de79aed3c1905423ba6b1ebbb86eca29bb Mon Sep 17 00:00:00 2001
+From 852a1dd131d9000971455eefb6fa252b0c1226e2 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.28.0
+2.29.2
diff --git a/PKGBUILD b/PKGBUILD
index f1075650a35..0c9bafcd3be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
_qt_module=qtmultimedia
pkgname=mingw-w64-qt5-multimedia-static
-pkgver=5.15.1
+pkgver=5.15.2
pkgrel=1
arch=('any')
pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -27,10 +27,10 @@ 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=('ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99'
- '98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569'
- '8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3'
- '63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40')
+sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5'
+ '36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399'
+ 'b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064'
+ '5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtmultimedia-sha256.txt b/qtmultimedia-sha256.txt
index 72f3c43681d..b851f120612 100644
--- a/qtmultimedia-sha256.txt
+++ b/qtmultimedia-sha256.txt
@@ -1 +1 @@
-ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99
+0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5