diff options
author | Martchus | 2017-06-08 21:42:44 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:42:44 +0200 |
commit | eb8eca2906e702633e4d3c019aa0d2cc218dbaa2 (patch) | |
tree | 5e57937fc1ec894e294603f20dca00697fd89515 | |
parent | 91fb829eecefd3a4a6be3dce022e9cba6bec5db2 (diff) | |
download | aur-eb8eca2906e702633e4d3c019aa0d2cc218dbaa2.tar.gz |
Update to 5.9.0
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch | 20 | ||||
-rw-r--r-- | 0002-Fix-build-with-ANGLE.patch | 6 | ||||
-rw-r--r-- | PKGBUILD | 8 |
4 files changed, 23 insertions, 23 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Feb 9 20:00:41 UTC 2017 +# Thu Jun 8 19:42:44 UTC 2017 pkgbase = mingw-w64-qt5-multimedia pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64) - pkgver = 5.8.0 + pkgver = 5.9.0 pkgrel = 1 url = https://www.qt.io/ arch = any @@ -20,12 +20,12 @@ pkgbase = mingw-w64-qt5-multimedia options = !strip options = !buildflags options = staticlibs - source = https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz + source = https://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtmultimedia-opensource-src-5.9.0.tar.xz source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch source = 0002-Fix-build-with-ANGLE.patch - md5sums = c8610023cfe036d3ad7c13f6e99892cf - md5sums = cb0cb6bc9e82d052fe9d973019c99d9b - md5sums = 27c71ce264710693d99e1e12ba82c106 + sha256sums = 0bb370923ba2e6d122940b07352a1a2f52ebbb061bec72e30df22a9e2edd60ee + sha256sums = 641bdc0c11d274fa5db0223ca122079d6f417c531ab0030825796f67fd36ec0f + sha256sums = f26232dae274cef92a2b9b2e885c0196afb3a061e58f06f28969b2ad79ac90ee 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 22dae55f31fb..df794209ba1f 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 ecfcbb10eaae22d0887e074e3734d6d9e69d2e34 Mon Sep 17 00:00:00 2001 +From 6d06f53c95a7c3e3b47578714d12a14eac26a72d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf @@ -8,8 +8,8 @@ This is a C header which also #include's stdio.h which adds a #define vsnprintf This #define vsnprint conflicts with QtCore/qstring.h so reorder the includes a bit to prevent this situation --- - src/multimedia/video/qvideosurfaceformat.h | 1 + - src/plugins/directshow/helpers/directshowglobal.h | 1 + + src/multimedia/video/qvideosurfaceformat.h | 1 + + src/plugins/directshow/common/directshowglobal.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h @@ -24,18 +24,18 @@ index 83785ac0..25607d08 100644 #include <QtGui/qimage.h> #include <QtMultimedia/qvideoframe.h> -diff --git a/src/plugins/directshow/helpers/directshowglobal.h b/src/plugins/directshow/helpers/directshowglobal.h -index f7890c52..4f7c8213 100644 ---- a/src/plugins/directshow/helpers/directshowglobal.h -+++ b/src/plugins/directshow/helpers/directshowglobal.h +diff --git a/src/plugins/directshow/common/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h +index 5f391710..3ae3b8aa 100644 +--- a/src/plugins/directshow/common/directshowglobal.h ++++ b/src/plugins/directshow/common/directshowglobal.h @@ -43,6 +43,7 @@ #include <dshow.h> #include <QtCore/qglobal.h> +#include <QtCore/qstring.h> + #include <QtCore/qloggingcategory.h> - template <typename T> T *com_cast(IUnknown *unknown, const IID &iid) - { + QT_BEGIN_NAMESPACE -- -2.11.0 +2.13.0 diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch index 5dd599ffe6c6..0dae7837ceef 100644 --- a/0002-Fix-build-with-ANGLE.patch +++ b/0002-Fix-build-with-ANGLE.patch @@ -1,4 +1,4 @@ -From 17ca839c5b370748fc55e64f826d39ab25eee13e Mon Sep 17 00:00:00 2001 +From a89d4b71b43afa80a84281bd11c8bcd2c8b068a2 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/2] Fix build with ANGLE @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] 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 9718c78b..5bd8d81a 100644 +index 4bc2bac8..d673f559 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp @@ -49,9 +49,9 @@ @@ -25,5 +25,5 @@ index 9718c78b..5bd8d81a 100644 #endif -- -2.11.0 +2.13.0 @@ -10,7 +10,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.8.0 +pkgver=5.9.0 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -24,9 +24,9 @@ _pkgfqn="${_qt_module}-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch') -md5sums=('c8610023cfe036d3ad7c13f6e99892cf' - 'cb0cb6bc9e82d052fe9d973019c99d9b' - '27c71ce264710693d99e1e12ba82c106') +sha256sums=('0bb370923ba2e6d122940b07352a1a2f52ebbb061bec72e30df22a9e2edd60ee' + '641bdc0c11d274fa5db0223ca122079d6f417c531ab0030825796f67fd36ec0f' + 'f26232dae274cef92a2b9b2e885c0196afb3a061e58f06f28969b2ad79ac90ee') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ |