Sync vlc-nightly with regular package, fix fribidi

Not tested yet
2018-02-25 19:06:42 +01:00 · 2018-02-25 19:06:42 +01:00 · c97097a3b8
parent bb67f661c8
commit c97097a3b8
4 changed files with 118 additions and 86 deletions
--- a/vlc/nightly/PKGBUILD
+++ b/vlc/nightly/PKGBUILD
@ -5,10 +5,10 @@

 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=4.0.0v20180223
+pkgver=4.0.0v20180225
 _pkgver=4.0.0
-_snapshot_=20180223
-_snapver_=0238
+_snapshot_=20180225
+_snapver_=0234
 _suffix_=dev
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
@ -17,53 +17,65 @@ url='https://www.videolan.org/vlc/'
 arch=('x86_64')
 license=('LGPL2.1' 'GPL2')
 _undetected_depends=()
-depends=('libmatroska' 'a52dec' 'sidplay2-libs' 'libfdk-aac' 'faad2' 'ffmpeg' 'libdca' 'daala-git' 'libdvbpsi'
-         'libdvdnav' 'libmad' 'libmpcdec' 'libmpeg2'
-         'libproxy' 'libshout' 'libtar' 'libtiger' 'libupnp'
-         'libxinerama' 'libxpm' 'lua' 'sdl_image' 'mesa' 'sndio' 'wayland' 'wayland-protocols'
-         'taglib' 'xcb-util-keysyms' 'zvbi' 'libsecret' 'libarchive' 'qt5-base' 'qt5-svg' 'libglvnd'
-         'hicolor-icon-theme' 'qt5-x11extras' "${_detected_depends[@]}")
-makedepends=('aalib' 'flac' 'git'
-             'libavc1394' 'libbluray' 'libcaca' 'libdc1394' 'libdvdcss'
-             'libgme' 'libgoom2' 'libmtp' 'libnotify' 'librsvg'
-             'libssh2' 'lirc' 'live-media'  'opus'
-             'portaudio' 'projectm' 'twolame' 'vcdimager' 'smbclient')
-optdepends=('aalib: for ASCII art plugin'
-            'avahi: for service discovery using bonjour protocol'
-            'flac: for Free Lossless Audio Codec plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libbluray: for Blu-Ray support'
-            'libcaca: for colored ASCII art video output'
-            'libcdio: for audio CD playback support'
-            'libdc1394: for IEEE 1394 plugin'
-            'libdvdcss: for decoding encrypted DVDs'
-            'libgme: for libgme plugin'
-            'libgoom2: for libgoom plugin'
-            'libmtp: for MTP devices support'
-            'libnotify: for notification plugin'
-            'librsvg: for SVG plugin'
-            'libssh2: for sftp support'
-            'libva-intel-driver: back-end for intel cards'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'lirc: for lirc plugin'
-            'lua-socket: for http interface'
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'sdl_image' 'libdvdnav'
+         'libtiger' 'lua' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg'
+         'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms'
+         'libtar' 'libxinerama' 'wayland-protocols' 'libsecret' 'libarchive'
+         'qt5-base' 'qt5-x11extras' 'qt5-svg' "${_detected_depends[@]}")
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394'
+             'libavc1394' 'lirc' 'libcaca' 'gtk3' 'librsvg' 'portaudio'
+             'libgme' 'xosd' 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
+             'smbclient' 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'protobuf'
+             'opencv' 'libnfs' 'mpg123' 'schroedinger' 'gst-plugins-base-libs'
+             'sidplay2-libs' 'libfdk-aac' 'daala-git' 'sndio')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: notification plugin'
+            'gtk3: notification plugin'
            'ncurses: for ncurses interface support'
-            'opus: for opus support'
-            'portaudio: for portaudio support'
-            'projectm: for ProjectM visualisation plugin'
-            'smbclient: for SMB access plugin'
-            'ttf-dejavu: for subtitle font'
-            'ttf-freefont: for subtitle font'
+            'gst-plugins-base-libs: for libgst plugins'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc: lirc control plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
+            'portaudio: portaudio support'
            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'vcdimager: navigate VCD with libvcdinfo')
+            'projectm: for ProjectM visualisation plugin'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
+            'smbclient: for SMB access plugin'
+            'libcdio: for audio CD playback support'
+            'ttf-freefont: for subtitle font'
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support'
+            'libssh2: for sftp support'
+            'opencv: opencv video support'
+            'libnfs: NFS access support'
+            'mpg123: mpg123 codec support'
+            'schroedinger: schroedinger codec support'
+            'protobuf: chromecast support'
+            'lua-socket: for http interface'
+            'sidplay2-libs: for C64 sid demuxer'
+            'libfdk-aac: for FDK-AAC Audio encoder'
+            'daala-git: for Daala video support'
+            'sndio: for OpenBSD sndio audio output')
 conflicts=("${_appname_}-plugin" "${_appname_}")
 provides=("${_appname_}")
 replaces=("${_appname_}-plugin")
 options=('!emptydirs')
 source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-${_suffix_}.tar.xz"
        'update-vlc-plugin-cache.hook'
-        'https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc'
+        'lua53_compat.patch'
+        'fribidi_compat.patch'
        'find-deps.py')

 pkgver() {
@ -75,9 +87,12 @@ prepare() {

  ./bootstrap

-  patch -Np1 -i "${srcdir}/vlc"
+  patch -Np1 -i "${srcdir}/lua53_compat.patch"
+  patch -Np1 -i "${srcdir}/fribidi_compat.patch"
  sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
+  sed 's|whoami|echo builduser|g' -i configure
+  sed 's|hostname -f|echo arch|g' -i configure
 }

 build() {
@ -93,21 +108,23 @@ build() {
  ./configure \
    --prefix=/usr \
    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
    --disable-rpath \
-    --disable-fribidi \
-    --enable-faad \
-    --enable-nls \
-    --enable-lirc \
-    --enable-ncurses \
-    --enable-realrtsp \
    --enable-aa \
-    --enable-upnp \
-    --enable-opus \
-    --enable-sftp \
-    --enable-fdkaac \
    --enable-archive \
    --enable-bluray \
-    --enable-daala
+    --enable-daala \
+    --enable-faad \
+    --enable-fdkaac \
+    --enable-lirc \
+    --enable-ncurses \
+    --enable-nls \
+    --enable-opus \
+    --enable-realrtsp \
+    --enable-sftp \
+    --enable-upnp \
+    --enable-vcdx \
+    --enable-wayland

  ./compile
 }
@ -132,7 +149,8 @@ package() {
  #  depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
 }

-sha256sums=('ab9063565f6ab93633994336001879de03740f5548bf13b1c04086ea4b3bfd85'
+sha256sums=('29bf008daa301b204c90fda129d95440f374224d3fecb956c052a945c8d636f2'
            'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
-            'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
+            '75ad8802bad1a79754e40fd107f5a6922c54f7467dadef8b439b49d410c8f7d2'
+            'a5273ca82c95a3b70573f9b71ad4fd49d970e78fc5a3cc7970648474d00df5d5'
            '90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')
--- a/vlc/nightly/fribidi_compat.patch
+++ b/vlc/nightly/fribidi_compat.patch
@ -0,0 +1,23 @@
+From 645effb2077e3aa9de70d30e14afc3e395ade2c6 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 24 Feb 2018 01:35:46 +0100
+Subject: [PATCH] text_renderer: freetype: allow using recent fribidi
+
+---
+ modules/text_renderer/freetype/text_layout.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
+index 13efd567b46..6e554d4cbe1 100644
+--- a/modules/text_renderer/freetype/text_layout.c
+++ b/modules/text_renderer/freetype/text_layout.c
+@@ -54,6 +54,9 @@
+ #if defined(HAVE_FRIBIDI)
+ # define FRIBIDI_NO_DEPRECATED 1
+ # include <fribidi.h>
+# ifndef fribidi_get_par_embedding_levels
+#  include <fribidi-deprecated.h>
+# endif
+ #endif
+ 
+ /* Complex Scripts */
--- a/vlc/nightly/lua53_compat.patch
+++ b/vlc/nightly/lua53_compat.patch
@ -0,0 +1,21 @@
+From 5824efb5fbb8aa00773aa2ff891645d17e68efc8 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 24 Feb 2018 01:32:40 +0100
+Subject: [PATCH] lua: fix build using lua 5.3
+
+---
+ modules/lua/vlc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 71f381d334a..b46b5f67a1b 100644
+--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
+#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */
--- a/vlc/nightly/vlc
+++ b/vlc/nightly/vlc
@ -1,30 +0,0 @@
-commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
-Author: Vinson Lee <vlee@freedesktop.org>
-Date:   Thu Feb 5 14:48:53 2015 -0800
-
-    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
-    
-    In Lua 5.3.0, luaL_checkint was deprecated.
-    
-    This patch fixes this build error with Lua 5.3.0.
-    
-    lua/demux.c: In function ‘vlclua_demux_peek’:
-    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
-         int n = luaL_checkint( L, 1 );
-         ^
-    
-    Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
-
-diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
-index efd94f1..85c7fc1 100644
--- a/modules/lua/vlc.h
-+++ b/modules/lua/vlc.h
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
- 
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h>        /* Low level lua C API */
- #include <lauxlib.h>    /* Higher level C API */