summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-05-18 11:22:41 +0200
committerMartchus2022-05-18 11:22:41 +0200
commit68c893f7f5790816106bc9c02bcd3b3ac21f3869 (patch)
tree20a4b4bdce76c07a1ed70ee3461bef8746d93768
parentad3a78d8947e8bbf5d9a3910d3cafbbbb08669b4 (diff)
downloadaur-68c893f7f5790816106bc9c02bcd3b3ac21f3869.tar.gz
Rebase against 5.15.4
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--qtmultimedia-sha256.txt2
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1227835cd297..75aebbe2e803 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.3+kde+r0
+ pkgver = 5.15.4+kde+r0
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -18,7 +18,7 @@ pkgbase = mingw-w64-qt5-multimedia-static
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 533b1b20f21e..dd938bf9fe81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,14 @@
_qt_module=qtmultimedia
pkgname=mingw-w64-qt5-multimedia-static
-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-static' 'mingw-w64-qt5-declarative-static')
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/qtmultimedia-sha256.txt b/qtmultimedia-sha256.txt
index b851f120612d..cc2ecb636e3a 100644
--- a/qtmultimedia-sha256.txt
+++ b/qtmultimedia-sha256.txt
@@ -1 +1 @@
-0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
+SKIP