libnfs 3.0.0 rebuild

3 files changed, 45 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e153014a477c..5a7a1c442ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jun 16 14:07:50 UTC 2018
+# Sun Jul 15 06:53:14 UTC 2018
 pkgbase = vlc-nox
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support)
 	pkgver = 3.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.videolan.org/vlc/
 	arch = x86_64
 	license = LGPL2.1
@@ -65,7 +65,6 @@ pkgbase = vlc-nox
 	depends = libxpm
 	depends = libdca
 	depends = libproxy
-	depends = libtiger
 	depends = lua
 	depends = libmatroska
 	depends = taglib
@@ -105,7 +104,6 @@ pkgbase = vlc-nox
 	optdepends = ttf-freefont: subtitle font
 	optdepends = ttf-dejavu: subtitle font
 	optdepends = libssh2: sftp access
-	optdepends = opencv: opencv video
 	optdepends = libnfs: NFS access
 	optdepends = mpg123: mpg123 codec
 	optdepends = protobuf: chromecast streaming
@@ -154,9 +152,11 @@ pkgbase = vlc-nox
 	options = !emptydirs
 	source = http://download.videolan.org/vlc/3.0.3/vlc-3.0.3.tar.xz
 	source = update-vlc-plugin-cache.hook
+	source = aom-remove-unsupported-pixel-formats.patch
 	source = lua53_compat.patch
 	sha512sums = 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
 	sha512sums = 80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df
+	sha512sums = 5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce
 	sha512sums = 33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f
 
 pkgname = vlc-nox
diff --git a/PKGBUILD b/PKGBUILD
index d6f8b1a40ef6..e269dfef9c58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgbase=vlc
 pkgname=vlc-nox
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -89,15 +89,18 @@ replaces=('vlc' 'vlc-plugin' 'vlc-git')
 options=('!emptydirs')
 source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
         update-vlc-plugin-cache.hook
+        aom-remove-unsupported-pixel-formats.patch
         lua53_compat.patch)
 sha512sums=('1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab'
             '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
+            '5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce'
             '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
 
 prepare() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
   sed -e 's|-Werror-implicit-function-declaration||g' -i configure
+  patch -Np1 < "${srcdir}/aom-remove-unsupported-pixel-formats.patch"
   patch -Np1 < "${srcdir}/lua53_compat.patch"
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
diff --git a/aom-remove-unsupported-pixel-formats.patch b/aom-remove-unsupported-pixel-formats.patch
new file mode 100644
index 000000000000..0a75d424f477
--- /dev/null
+++ b/aom-remove-unsupported-pixel-formats.patch
@@ -0,0 +1,37 @@
+From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Thu, 19 Apr 2018 18:25:07 +0300
+Subject: [PATCH] aom: Remove unsupported pixel formats
+
+Support for these was apparently never in the codebase, and the enum
+values were recently removed from the public headers [1].
+
+This fixes build with latest libaom build.
+
+[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12
+---
+ modules/codec/aom.c | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/modules/codec/aom.c b/modules/codec/aom.c
+index 5bb442b5d50..60034158c47 100644
+--- a/modules/codec/aom.c
++++ b/modules/codec/aom.c
+@@ -116,17 +116,6 @@ static const struct
+ 
+     { 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 },