Update to 5.14.1

8 files changed, 147 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82b30bf668aa..a8b0b3aebaeb 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.14.0
+	pkgver = 5.14.1
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -18,14 +18,16 @@ pkgbase = mingw-w64-qt5-multimedia
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtmultimedia-everywhere-src-5.14.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtmultimedia-everywhere-src-5.14.1.tar.xz
 	source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
 	source = 0002-Fix-build-with-ANGLE.patch
 	source = 0003-Link-directshow-plugin-against-libamstrmid.patch
-	sha256sums = e7901aa32fe71f1409cf73a0c62f27b98f434688e7b16ea8591b29cd8f90ad5e
-	sha256sums = cacf75d26ac096fb4956bd95a21bfdb591f9170dc34d03435c4514e257a11f70
-	sha256sums = 71707819e586f4c520d17791677a0541325cbace2e34a588bca2384343124f1f
-	sha256sums = 70e0c12297ea88f582f45870028176c95da421a63ac3cf4f94637a9f149db91b
+	source = 0004-Fix-case-of-header-file-includes-for-building-with-m.patch
+	sha256sums = c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7
+	sha256sums = 868eee99997f42ea69f1fd58938b447be77a20b3e210f6b4a2e547666f5e8456
+	sha256sums = c47b93ba7de47f0a67c7a200b1d9d36b7aefa507c5a8f2fb510cc69545fd3a7b
+	sha256sums = e35c8f9877b2ade5c650ca79e56b527db30dcfc39048f2694e4da25281f530a0
+	sha256sums = a008984f200628a3a58bcde1c95247b578af77d0abcab242f2a16f46db23e911
 
 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 25fd9e8569a1..3669437fa519 100644
--- a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
+++ b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
@@ -1,7 +1,7 @@
-From 1237e1525925542c935056f5ab7099efe34ca0eb Mon Sep 17 00:00:00 2001
+From 2163191d8a0828e158a1798a8b3cce698154c19e 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
+Subject: [PATCH 1/4] Recorder includes to prevent conflict with vsnprintf
 
 Some files #include <dshow.h>
 This is a C header which also #include's stdio.h which adds a #define vsnprintf
@@ -37,5 +37,5 @@ index 12693e4f..f759a8f2 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.24.1
+2.25.0
 
diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch
index 3cd7f5e84d3c..26d83fbe0901 100644
--- a/0002-Fix-build-with-ANGLE.patch
+++ b/0002-Fix-build-with-ANGLE.patch
@@ -1,7 +1,7 @@
-From 13db921fea3e466bc60a66559465dd3f40a77845 Mon Sep 17 00:00:00 2001
+From a63f4fc62c062f24ccb542c4955551d435364a7a 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
+Subject: [PATCH 2/4] Fix build with ANGLE
 
 ---
  src/plugins/common/evr/evrd3dpresentengine.cpp | 6 +++---
@@ -25,5 +25,5 @@ index d8e2da6d..41ef4d96 100644
  #endif
  
 -- 
-2.24.1
+2.25.0
 
diff --git a/0003-Link-directshow-plugin-against-libamstrmid.patch b/0003-Link-directshow-plugin-against-libamstrmid.patch
index fe3c371d9dbe..210110aa487c 100644
--- a/0003-Link-directshow-plugin-against-libamstrmid.patch
+++ b/0003-Link-directshow-plugin-against-libamstrmid.patch
@@ -1,7 +1,7 @@
-From 4015d046c4a5432f907e057cbe35702c5f5e44d4 Mon Sep 17 00:00:00 2001
+From 4ce906f280106ae0554a7dda7c3afdee43cda662 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Sep 2018 20:10:19 +0200
-Subject: [PATCH 3/3] Link directshow plugin against libamstrmid
+Subject: [PATCH 3/4] Link directshow plugin against libamstrmid
 
 Fixes errors about undefined references to IID_IMFVideoDeviceID,
 IID_IMFVideoPresenter, IID_IMFTopologyServiceLookupClient and
@@ -28,5 +28,5 @@ index 27bb3abb..5aa207dd 100644
  SOURCES += dsserviceplugin.cpp
  
 -- 
-2.24.1
+2.25.0
 
diff --git a/0004-Fix-case-of-header-file-includes-for-building-with-m.patch b/0004-Fix-case-of-header-file-includes-for-building-with-m.patch
new file mode 100644
index 000000000000..42b388fd5898
--- /dev/null
+++ b/0004-Fix-case-of-header-file-includes-for-building-with-m.patch
@@ -0,0 +1,97 @@
+From 67df270176cc41e18c8ce38df4dc7d756d8ac6e6 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 29 Dec 2019 00:39:46 +0100
+Subject: [PATCH 4/4] Fix case of header file includes for building with
+ mingw-w64
+
+Change-Id: Ie0e6599234c38c5e5a75b681a911f3728871861e
+---
+ config.tests/wshellitem/main.cpp                            | 2 +-
+ src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 +-
+ src/plugins/winrt/qwinrtcameracontrol.cpp                   | 2 +-
+ src/plugins/wmf/player/mfplayersession.cpp                  | 2 +-
+ src/plugins/wmf/player/mftvideo.cpp                         | 2 +-
+ src/plugins/wmf/sourceresolver.cpp                          | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/config.tests/wshellitem/main.cpp b/config.tests/wshellitem/main.cpp
+index 799ee555..459992b7 100644
+--- a/config.tests/wshellitem/main.cpp
++++ b/config.tests/wshellitem/main.cpp
+@@ -26,7 +26,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ int main(int, char**)
+ {
+diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+index 46674143..d9864870 100644
+--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
++++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ #if QT_CONFIG(wshellitem)
+-#include <ShlObj.h>
++#include <shlobj.h>
+ #include <propkeydef.h>
+ #include <private/qsystemlibrary_p.h>
+ 
+diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
+index ede3f6b0..98dd7c2f 100644
+--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
++++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
+@@ -54,7 +54,7 @@
+ 
+ #include <functional>
+ #include <mfapi.h>
+-#include <Mferror.h>
++#include <mferror.h>
+ #include <mfidl.h>
+ #include <wrl.h>
+ #include <windows.devices.enumeration.h>
+diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
+index 10ba2599..a4e37129 100644
+--- a/src/plugins/wmf/player/mfplayersession.cpp
++++ b/src/plugins/wmf/player/mfplayersession.cpp
+@@ -56,7 +56,7 @@
+ #include "mfplayersession.h"
+ #include "mfplayerservice.h"
+ #include "mfmetadatacontrol.h"
+-#include <Mferror.h>
++#include <mferror.h>
+ #include <nserror.h>
+ #include "sourceresolver.h"
+ #include "samplegrabber.h"
+diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/plugins/wmf/player/mftvideo.cpp
+index 879911d5..9dce654f 100644
+--- a/src/plugins/wmf/player/mftvideo.cpp
++++ b/src/plugins/wmf/player/mftvideo.cpp
+@@ -40,7 +40,7 @@
+ #include "mftvideo.h"
+ #include "mfvideoprobecontrol.h"
+ #include <private/qmemoryvideobuffer_p.h>
+-#include <Mferror.h>
++#include <mferror.h>
+ #include <strmif.h>
+ #include <uuids.h>
+ #include <InitGuid.h>
+diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
+index c6f4e856..15ef6f0a 100644
+--- a/src/plugins/wmf/sourceresolver.cpp
++++ b/src/plugins/wmf/sourceresolver.cpp
+@@ -39,7 +39,7 @@
+ 
+ #include "mfstream.h"
+ #include "sourceresolver.h"
+-#include <Mferror.h>
++#include <mferror.h>
+ #include <nserror.h>
+ #include <QtCore/qfile.h>
+ #include <QtCore/qdebug.h>
+-- 
+2.25.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 9ec43a7a80b7..c502aa356616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,51 @@
 # Maintainer: Martchus <martchus@gmx.net>
+# Contributor: ant32 <antreimer@gmail.com>
 
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# Includes dynamic and static versions; if only one version is requried, just
-# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+# This file is created from PKGBUILD.sh.in contained by the mentioned repository.
+# Do not edit it manually! See README.md in the repository's root directory
+# for more information.
 
 # All patches are managed at https://github.com/Martchus/qtmultimedia
 
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.14.0
+pkgver=5.14.1
 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')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
-license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
 _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'
-        '0003-Link-directshow-plugin-against-libamstrmid.patch')
-sha256sums=('e7901aa32fe71f1409cf73a0c62f27b98f434688e7b16ea8591b29cd8f90ad5e'
-            'cacf75d26ac096fb4956bd95a21bfdb591f9170dc34d03435c4514e257a11f70'
-            '71707819e586f4c520d17791677a0541325cbace2e34a588bca2384343124f1f'
-            '70e0c12297ea88f582f45870028176c95da421a63ac3cf4f94637a9f149db91b')
+        '0003-Link-directshow-plugin-against-libamstrmid.patch'
+        '0004-Fix-case-of-header-file-includes-for-building-with-m.patch')
+sha256sums=('c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7'
+            '868eee99997f42ea69f1fd58938b447be77a20b3e210f6b4a2e547666f5e8456'
+            'c47b93ba7de47f0a67c7a200b1d9d36b7aefa507c5a8f2fb510cc69545fd3a7b'
+            'e35c8f9877b2ade5c650ca79e56b527db30dcfc39048f2694e4da25281f530a0'
+            'a008984f200628a3a58bcde1c95247b578af77d0abcab242f2a16f46db23e911')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
 [[ $NO_STATIC_LIBS ]] || \
   makedepends+=('mingw-w64-qt5-base-static') \
   optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
-  _configurations+=('CONFIG+=static')
+  _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
 [[ $NO_SHARED_LIBS ]] || \
   _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
 
-link_header_files() {
-  for header in "$@"; do
-    ln -sf "/usr/${_arch}/include/${header,,}" "./sysinclude/${header}"
-  done
-}
-
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
@@ -60,10 +62,7 @@ build() {
     for _config in "${_configurations[@]}"; do
       msg2 "Building ${_config##*=} version for ${_arch}"
       mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
-      # Header are case sensitive under Linux, provide symlinks to prevent compile errors
-      mkdir -p ./sysinclude/qtgui && link_header_files {ShlObj,Evr9,Mferror}.h
-      ln -sf "/usr/${_arch}/include/qt/QtGui/qguiapplication.h" './sysinclude/qtgui/qguiapplication.h'
-      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} INCLUDEPATH+="${srcdir}/${_pkgfqn}/build-${_arch}/sysinclude"
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args}
       make
       popd
     done
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
new file mode 100644
index 000000000000..40584ca7a5c3
--- /dev/null
+++ b/PKGBUILD.sh.ep
@@ -0,0 +1,13 @@
+% layout 'mingw-w64-qt5-module';
+\
+% content_for additional_contributors => begin
+# Contributor: ant32 <antreimer@gmail.com>
+% end
+\
+pkgver=5.14.1
+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')
diff --git a/qtmultimedia-sha256.txt b/qtmultimedia-sha256.txt
new file mode 100644
index 000000000000..9f75822e7582
--- /dev/null
+++ b/qtmultimedia-sha256.txt
@@ -0,0 +1 @@
+c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7