updpkgver and removing things that are not needed or whatever

4 files changed, 15 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e7faabc03a4..a3c38b526f1e 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.0v20200307
+	pkgver = 4.0.0v20200328
 	pkgrel = 1
 	url = https://nightlies.videolan.org/
 	arch = x86_64
@@ -27,6 +27,8 @@ pkgbase = vlc-nightly
 	makedepends = libmicrodns
 	makedepends = libdvdcss
 	makedepends = smbclient
+	makedepends = flex
+	makedepends = bison
 	makedepends = vcdimager
 	makedepends = libssh2
 	makedepends = mesa
@@ -175,16 +177,12 @@ pkgbase = vlc-nightly
 	conflicts = vlc
 	replaces = vlc-plugin
 	options = !emptydirs
-	source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20200307-0230-dev.tar.xz
+	source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20200328-0231-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 = 1acc72f15a5f236f530ac00058eec237118748e8af23fdcac60661b9e494f08a
+	sha256sums = 984d90b4985028f6d87e18a007ea43eb938c339541d9c6d2ac9e1c1f39d6f446
 	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
deleted file mode 100644
index 0236f47506f9..000000000000
--- a/0001-I444-is-the-answer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 dbdb774288f9..0c38142be6e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
 
 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=4.0.0v20200307
+pkgver=4.0.0v20200328
 _pkgver=4.0.0
-_snapshot_=20200307
-_snapver_=0230
+_snapshot_=20200328
+_snapver_=0231
 _suffix_=dev
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
@@ -27,7 +27,7 @@ depends=('qt5-graphicaleffects' 'qt5-quickcontrols2' 'a52dec' 'libdvbpsi'
 makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
              'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3' 'lua' 
              'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
-             'libmtp' 'libmicrodns'  'libdvdcss' 'smbclient'
+             'libmtp' 'libmicrodns'  'libdvdcss' 'smbclient' 'flex' 'bison'
              'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
              'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
              'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
@@ -111,9 +111,7 @@ replaces=("${_appname_}-plugin")
 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')
+        '0001-lua-Fix-build-using-lua-5.3.patch')
 
 pkgver() {
  printf ${_pkgver}v$_snapshot_
@@ -125,9 +123,9 @@ 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 -e 's|-Werror-implicit-function-declaration||g' -i configure
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
 
@@ -140,7 +138,7 @@ build() {
   export CPPFLAGS+=" -I/usr/include/samba-4.0"
   export CXXFLAGS+=" -std=c++11"
   export LUAC=/usr/bin/luac
-  export LUA_LIBS="`pkg-config --libs lua`"
+  export LUA_LIBS="$(pkg-config --libs lua)"
   export RCC=/usr/bin/rcc-qt5
  # export CC=clang
  # export CXX=clang++
@@ -253,23 +251,15 @@ package() {
 
   make -i DESTDIR="${pkgdir}" install
 
-  for res in 16 32 48 128; do
+  for res in 16 32 48 128 256; do
     install -D -m644 "${srcdir}/${_appname_}-${_pkgver}-${_suffix_}/share/icons/${res}x${res}/${_appname_}.png" \
       "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_appname_}.png"
   done
 
   install -Dm644 "$srcdir"/update-vlc-plugin-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook
 
-  # Update dependencies automatically based on dynamic libraries
-  # _detected_depends=($(find "$pkgdir"/usr -name "*.so" | xargs python "$srcdir"/find-deps.py))
-
-  #  msg 'Auto-detected dependencies:'
-  #  echo "${_detected_depends[@]}" | fold -s -w 79 | sed 's/^/ /'
-  #  depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
 }
 
-sha256sums=('1acc72f15a5f236f530ac00058eec237118748e8af23fdcac60661b9e494f08a'
+sha256sums=('984d90b4985028f6d87e18a007ea43eb938c339541d9c6d2ac9e1c1f39d6f446'
             'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
-            '3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf'
-            'd6b3c0ce4853e952ef33a08b29dae65335fc5b9d8d66e37304ffa0257b50693a'
-            '90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')
+            '3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf')
diff --git a/find-deps.py b/find-deps.py
deleted file mode 100755
index 92095f934cfd..000000000000
--- a/find-deps.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Usage: find-deps.py <binary> [<binary> ...]
-
-Finds (pacman/ALPM) dependencies for a binary or set of binaries based
-on dynamically linked libraries.
-
-"""
-
-import sys
-import os
-import subprocess
-import re
-
-def subprocess_get_lines(args, fail_okay=False):
-    try:
-        output = subprocess.check_output(args)
-    except subprocess.CalledProcessError as e:
-        if fail_okay:
-            output = e.output
-        else:
-            raise
-    return output.decode().splitlines()
-
-# Get the filenames of the libs we need
-#del os.environ['LD_PRELOAD'] # otherwise fakeroot will interfere
-ldd_output = subprocess_get_lines(['ldd'] + sys.argv[1:])
-regex = re.compile(r' => (.*) \(0x[0-9a-f]+\)$')
-libs = set(match.group(1) for match in map(regex.search, ldd_output) if match)
-
-# Figure out which packages own them
-deps = set(subprocess_get_lines(
-    ['pacman', '--query', '--owns', '--quiet'] + list(libs),
-    fail_okay=True
-))
-
-# Remove redundant dependencies
-needed = set(deps)
-for pkg in deps:
-    if pkg not in needed:
-        continue # this subtree has already been pruned
-    redundant = subprocess_get_lines(
-        ['pactree', '--unique', pkg]
-    )[1:] # first line is pkg itself
-    needed.difference_update(redundant)
-
-print(' '.join(sorted(needed)))