From 862ff33445c2ad8d0124d35d96987dcd686b3ff3 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 31 Jul 2018 07:51:16 +0300
Subject: [PATCH] vlc: Fix building

---
 mingw-w64-vlc/0018-aom-1_x-support.patch | 20 ++++++++++++++++++++
 mingw-w64-vlc/0019-qt5-headers.patch     | 11 +++++++++++
 mingw-w64-vlc/PKGBUILD                   | 12 +++++++++---
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-vlc/0018-aom-1_x-support.patch
 create mode 100644 mingw-w64-vlc/0019-qt5-headers.patch

diff --git a/mingw-w64-vlc/0018-aom-1_x-support.patch b/mingw-w64-vlc/0018-aom-1_x-support.patch
new file mode 100644
index 0000000000..64a443651e
--- /dev/null
+++ b/mingw-w64-vlc/0018-aom-1_x-support.patch
@@ -0,0 +1,20 @@
+--- vlc-3.0.3/modules/codec/aom.c.orig	2018-07-30 21:48:17.262980800 +0300
++++ vlc-3.0.3/modules/codec/aom.c	2018-07-30 21:48:22.732293600 +0300
+@@ -89,17 +89,6 @@
+ 
+     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+     { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
+-    { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
+-    { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
+-    { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
+-
+-    { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
+-    { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
+-    { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
+-    { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
+-
+-    { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
+-    { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
+ 
+     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },
diff --git a/mingw-w64-vlc/0019-qt5-headers.patch b/mingw-w64-vlc/0019-qt5-headers.patch
new file mode 100644
index 0000000000..c125281528
--- /dev/null
+++ b/mingw-w64-vlc/0019-qt5-headers.patch
@@ -0,0 +1,11 @@
+--- vlc-3.0.3/modules/gui/qt/components/simple_preferences.cpp.orig	2018-07-30 22:02:47.106733000 +0300
++++ vlc-3.0.3/modules/gui/qt/components/simple_preferences.cpp	2018-07-30 22:04:52.938930200 +0300
+@@ -33,6 +33,8 @@
+ #include <vlc_config_cat.h>
+ #include <vlc_configuration.h>
+ 
++#include <QHeaderView>
++#include <QButtonGroup>
+ #include <QString>
+ #include <QFont>
+ #include <QToolButton>
diff --git a/mingw-w64-vlc/PKGBUILD b/mingw-w64-vlc/PKGBUILD
index 22cf4a9114..1faab64890 100644
--- a/mingw-w64-vlc/PKGBUILD
+++ b/mingw-w64-vlc/PKGBUILD
@@ -11,7 +11,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('any')
 url="https://www.videolan.org/vlc/"
@@ -130,7 +130,9 @@ source=(http://get.videolan.org/${_realname}/${pkgver}/${_realname}-${pkgver}.ta
         0013-remove-AllocConsole-reference-for-WINSTORE.patch
         0014-Remove-some-legacy-mingw.org-header-defines.patch
         0015-x264-more-than-153-support.patch
-        0017-fribidi-1_x-support.patch)
+        0017-fribidi-1_x-support.patch
+        0018-aom-1_x-support.patch
+        0019-qt5-headers.patch)
 sha256sums=('9ba8b04bdb13f7860a2041768ac83b47b397a36549c71c530b94028a3cfd5b51'
             '130cdf7655deca92fd28dd177cd99aab24113bd1052700896046b66acbcb1f2d'
             '8f40d57bb087306e5099c5b9067dacca0479c4dc9e45eb902ad04eeb3fb83ef3'
@@ -144,7 +146,9 @@ sha256sums=('9ba8b04bdb13f7860a2041768ac83b47b397a36549c71c530b94028a3cfd5b51'
             '64a1a0efd69e8ebb36df08c45ff8ae71e1b90d2c78ee7fd3229739c2d76a384d'
             'cb07edb1c4db96a9ee85aae0d32ae6b491dc9c433058507031050455e0bb3d06'
             'c96a46b638d6ed665e7665403c8de52572230ddf3cbf1e63cab71fcd26b31520'
-            '2fd8d1425195811ea8a8678d272d9048e8a4d9b9e2d5eb86566159b9ee76fd01')
+            '2fd8d1425195811ea8a8678d272d9048e8a4d9b9e2d5eb86566159b9ee76fd01'
+            '9a5cb6d0b58daaf25e11106f949461b65e1d14d1f55c6c113a982827aea4f80a'
+            '278e6111e467dfb1b6b4228489dc6ab029abfa11df3c77d8cd8021987a11b4ea')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
@@ -161,6 +165,8 @@ prepare() {
   patch -p1 -i "${srcdir}"/0007-Mingw-load-libraries-not-only-from-system32.patch
   patch -p1 -i "${srcdir}"/0015-x264-more-than-153-support.patch
   patch -p1 -i "${srcdir}"/0017-fribidi-1_x-support.patch
+  patch -p1 -i "${srcdir}"/0018-aom-1_x-support.patch
+  patch -p1 -i "${srcdir}"/0019-qt5-headers.patch
 
   if [ "${_variant}" == "winrt" ]; then
     patch -p1 -i "${srcdir}"/0011-Add-include-on-WINSTORE-for-QueueTimer-functions.patch