summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-05-18 11:22:38 +0200
committerMartchus2022-05-18 11:22:38 +0200
commita79ea60b040f488cdfec4343074c48a47df79738 (patch)
treec388a34cffc39849c74da51f1fc0742f368fe97d
parentc45248fa6e9a2bcbeb8de735612034c00074b396 (diff)
downloadaur-a79ea60b040f488cdfec4343074c48a47df79738.tar.gz
Rebase against 5.15.4
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--PKGBUILD.sh.ep2
-rw-r--r--qtmultimedia-sha256.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8bac084504d9..500ea2cb4094 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.3+kde+r0
+ pkgver = 5.15.4+kde+r0
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -17,7 +17,7 @@ pkgbase = mingw-w64-qt5-multimedia
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qtmultimedia#commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5
+ source = git+https://invent.kde.org/qt/qt/qtmultimedia#commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
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
diff --git a/PKGBUILD b/PKGBUILD
index 96bcc2f36353..d9a5d3e74a72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,14 @@
_qt_module=qtmultimedia
pkgname=mingw-w64-qt5-multimedia
-pkgver=5.15.3
+pkgver=5.15.4
pkgrel=1
arch=('any')
pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5
+_commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
_basever=$pkgver
pkgver+=+kde+r0
makedepends+=('git')
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 7762ac24bccc..2cd8e25c6956 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -4,7 +4,7 @@
# Contributor: ant32 <antreimer@gmail.com>
% end
\
-pkgver=5.15.3
+pkgver=5.15.4
pkgrel=1
arch=('any')
pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
diff --git a/qtmultimedia-sha256.txt b/qtmultimedia-sha256.txt
index b851f120612d..cc2ecb636e3a 100644
--- a/qtmultimedia-sha256.txt
+++ b/qtmultimedia-sha256.txt
@@ -1 +1 @@
-0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
+SKIP