updpkgver and some fixes for aom I think

3 files changed, 39 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11eed27dfcbe..2e7faabc03a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vlc-nightly
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
-	pkgver = 4.0.0v20200304
+	pkgver = 4.0.0v20200307
 	pkgrel = 1
 	url = https://nightlies.videolan.org/
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = vlc-nightly
 	makedepends = libavc1394
 	makedepends = libcaca
 	makedepends = gtk3
+	makedepends = lua
 	makedepends = librsvg
 	makedepends = libgme
 	makedepends = xosd
@@ -174,13 +175,15 @@ pkgbase = vlc-nightly
 	conflicts = vlc
 	replaces = vlc-plugin
 	options = !emptydirs
-	source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20200304-0231-dev.tar.xz
+	source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20200307-0230-dev.tar.xz
 	source = update-vlc-plugin-cache.hook
 	source = 0001-lua-Fix-build-using-lua-5.3.patch
+	source = 0001-I444-is-the-answer.patch
 	source = find-deps.py
-	sha256sums = 15636dc8f9043fade157c35f7cbbfea7c8de8c163b0cdcae9d6e63e9527f9e99
+	sha256sums = 1acc72f15a5f236f530ac00058eec237118748e8af23fdcac60661b9e494f08a
 	sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
 	sha256sums = 3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf
+	sha256sums = d6b3c0ce4853e952ef33a08b29dae65335fc5b9d8d66e37304ffa0257b50693a
 	sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
 
 pkgname = vlc-nightly
diff --git a/0001-I444-is-the-answer.patch b/0001-I444-is-the-answer.patch
new file mode 100644
index 000000000000..0236f47506f9
--- /dev/null
+++ b/0001-I444-is-the-answer.patch
@@ -0,0 +1,25 @@
+From 3ba7a1bd60735932867c46ceccc1f714314d1158 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Thu, 5 Mar 2020 12:55:55 -0500
+Subject: [PATCH] I444 is the answer
+
+---
+ modules/codec/aom.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/codec/aom.c b/modules/codec/aom.c
+index e4cf5d4ff2..6df26de0ff 100644
+--- a/modules/codec/aom.c
++++ b/modules/codec/aom.c
+@@ -132,7 +132,7 @@ static const struct
+     { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
+ 
+     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+-    { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
++    { VLC_CODEC_YUVA, AOM_IMG_FMT_I444, 8, 0 },
+ 
+     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },
+-- 
+2.25.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 52efa388c0ea..dbdb774288f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
 
 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=4.0.0v20200304
+pkgver=4.0.0v20200307
 _pkgver=4.0.0
-_snapshot_=20200304
-_snapver_=0231
+_snapshot_=20200307
+_snapver_=0230
 _suffix_=dev
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
@@ -25,7 +25,7 @@ depends=('qt5-graphicaleffects' 'qt5-quickcontrols2' 'a52dec' 'libdvbpsi'
          'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
          'wayland-protocols' 'aribb24' 'libfdk-aac')
 makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
+             'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3' 'lua' 
              'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
              'libmtp' 'libmicrodns'  'libdvdcss' 'smbclient'
              'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
@@ -112,6 +112,7 @@ options=('!emptydirs')
 source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-${_suffix_}.tar.xz"
         'update-vlc-plugin-cache.hook'
         '0001-lua-Fix-build-using-lua-5.3.patch'
+        '0001-I444-is-the-answer.patch'
         'find-deps.py')
 
 pkgver() {
@@ -124,6 +125,7 @@ prepare() {
   ./bootstrap
 
   patch -Np1 -i "${srcdir}/0001-lua-Fix-build-using-lua-5.3.patch"
+  patch -Np1 -i "${srcdir}/0001-I444-is-the-answer.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
@@ -266,7 +268,8 @@ package() {
   #  depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
 }
 
-sha256sums=('15636dc8f9043fade157c35f7cbbfea7c8de8c163b0cdcae9d6e63e9527f9e99'
+sha256sums=('1acc72f15a5f236f530ac00058eec237118748e8af23fdcac60661b9e494f08a'
             'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
             '3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf'
+            'd6b3c0ce4853e952ef33a08b29dae65335fc5b9d8d66e37304ffa0257b50693a'
             '90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')