git » vlc.git » commit 893eec0

x265 2.8 rebuild: vlc 3.0.2-2

author Maxime Gauduin
2018-05-25 17:42:25 UTC
committer Maxime Gauduin
2018-05-25 17:42:25 UTC
parent 3eae2a4789f83bb305445b7c4d99ebebcd9dcee4

x265 2.8 rebuild: vlc 3.0.2-2

PKGBUILD +6 -3
vlc-qt5.11.patch +10 -0

diff --git a/PKGBUILD b/PKGBUILD
index 64a5955..4dab4af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=vlc
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -92,11 +92,13 @@ replaces=('vlc-plugin')
 options=('!emptydirs')
 source=(https://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
         update-vlc-plugin-cache.hook
-        lua53_compat.patch)
+        lua53_compat.patch
+        vlc-qt5.11.patch)
 sha512sums=('907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f'
             'SKIP'
             '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
-            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
+            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f'
+            '66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
@@ -106,6 +108,7 @@ prepare() {
   patch -Np1 < "${srcdir}/lua53_compat.patch"
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
+  patch -Np1 < "${srcdir}/vlc-qt5.11.patch"
 }
 
 build() {
diff --git a/vlc-qt5.11.patch b/vlc-qt5.11.patch
new file mode 100755
index 0000000..c99d898
--- /dev/null
+++ b/vlc-qt5.11.patch
@@ -0,0 +1,10 @@
+--- a/modules/gui/qt/components/simple_preferences.cpp	2018-01-25 17:57:40.000000000 +0100
++++ b/modules/gui/qt/components/simple_preferences.cpp	2018-03-18 21:08:51.212556781 +0100
+@@ -33,6 +33,7 @@
+ #include <vlc_config_cat.h>
+ #include <vlc_configuration.h>
+ 
++#include <QButtonGroup>
+ #include <QString>
+ #include <QFont>
+ #include <QToolButton>