summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2017-12-14 01:06:24 +0100
committerMartchus2017-12-14 01:06:24 +0100
commitbf1f7f494f1a5a014677b5127939760044bb8d2b (patch)
tree99408b509d3ef7d0bb299dfc856de6ff4d3aa23a
parent90933104df2381975c171abef287a4b360eb3f29 (diff)
downloadaur-bf1f7f494f1a5a014677b5127939760044bb8d2b.tar.gz
Update to 5.10.0
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch4
-rw-r--r--0002-Fix-build-with-ANGLE.patch8
-rw-r--r--PKGBUILD12
4 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86a152c86ed8..0bea99f25d10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Oct 16 17:36:27 UTC 2017
+# Thu Dec 14 00:06:24 UTC 2017
pkgbase = mingw-w64-qt5-multimedia
pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64)
- pkgver = 5.9.2
+ pkgver = 5.10.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.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz
source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
source = 0002-Fix-build-with-ANGLE.patch
- sha256sums = c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520
- sha256sums = f915b6feb5eb1254e33667556ebda15df73b07bab9f8bf0d57325f48d262ef62
- sha256sums = 53c8e9cc9b7ba69d87d6ab668bf0414e20e5c3d79a156dce35746deaafa8a8ad
+ sha256sums = 008333fdc3bc2d87977392397d38ebaae1329059997319cb1b0613fb6489806f
+ sha256sums = 18df01e77021563ade5cd1a10efd053ce635c1ee3d81fe41ba9549aab1201fbe
+ sha256sums = 54e4dd97457b1b9a9f061268daefaaea5ab64b752039a7a295107dad39093d6d
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 30583753022e..b5285fee79d0 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 b6482345c48aa2a0cc15064246c06964322b8572 Mon Sep 17 00:00:00 2001
+From b8444c5857432101b58cba43d43906b903da77ff 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
@@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644
QT_BEGIN_NAMESPACE
--
-2.14.2
+2.15.1
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index cea4ab90e6e7..15b7d31289c5 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From 81791388b2bf15a35d64c0ec2d7d382cd5bdb255 Mon Sep 17 00:00:00 2001
+From bb44cfccb2ff6cb24f16293e874d3ff335b17b51 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,14 +8,14 @@ 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 043d0ad7..bdf25a9c 100644
+index fd9ccdef..bdf25a9c 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.cpp
+++ b/src/plugins/common/evr/evrd3dpresentengine.cpp
@@ -49,9 +49,9 @@
#include <private/qmediaopenglhelper_p.h>
#ifdef MAYBE_ANGLE
--# include <qtgui/qguiapplication.h>
+-# include <qguiapplication.h>
-# include <qpa/qplatformnativeinterface.h>
-# include <qopenglfunctions.h>
+# include <QtGui/qguiapplication.h>
@@ -25,5 +25,5 @@ index 043d0ad7..bdf25a9c 100644
#endif
--
-2.14.2
+2.15.1
diff --git a/PKGBUILD b/PKGBUILD
index c786a5f40081..b75f173c804b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_qt_module=qtmultimedia
pkgname=mingw-w64-qt5-multimedia
-pkgver=5.9.2
+pkgver=5.10.0
pkgrel=1
arch=('any')
pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -20,13 +20,13 @@ options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
license=('GPL3' 'LGPL' 'FDL' 'custom')
url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
'0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch'
'0002-Fix-build-with-ANGLE.patch')
-sha256sums=('c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520'
- 'f915b6feb5eb1254e33667556ebda15df73b07bab9f8bf0d57325f48d262ef62'
- '53c8e9cc9b7ba69d87d6ab668bf0414e20e5c3d79a156dce35746deaafa8a8ad')
+sha256sums=('008333fdc3bc2d87977392397d38ebaae1329059997319cb1b0613fb6489806f'
+ '18df01e77021563ade5cd1a10efd053ce635c1ee3d81fe41ba9549aab1201fbe'
+ '54e4dd97457b1b9a9f061268daefaaea5ab64b752039a7a295107dad39093d6d')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \