vivaldi-ffmpeg-codecs :: 84.0.4147.105-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>

2 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23e53f11935a..e5739de57165 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jun 24 09:41:12 UTC 2020
+# Fri Aug  7 06:28:05 UTC 2020
 pkgbase = vivaldi-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for vivaldi
-	pkgver = 83.0.4103.116
+	pkgver = 84.0.4147.105
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -14,12 +14,13 @@ pkgbase = vivaldi-ffmpeg-codecs
 	makedepends = nss
 	makedepends = pciutils
 	makedepends = python2
+	makedepends = python
 	makedepends = xdg-utils
 	makedepends = gn
 	depends = glibc
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.116.tar.xz
-	sha512sums = dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.105.tar.xz
+	sha512sums = 23cdd8b49c3276b16f1b4753fadf9f428720f0a95a3f567d189ba0e8a231d7bc1f62e96da6188645243eedac15ecc554b97e83c1a63aa647e7946cc1ba015a8c
 
 pkgname = vivaldi-ffmpeg-codecs
 
diff --git a/PKGBUILD b/PKGBUILD
index aefee995c605..404fe4f49ac7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=vivaldi-ffmpeg-codecs
-pkgver=83.0.4103.116
-_vivaldi_major_version=3.1
+pkgver=84.0.4147.105
+_vivaldi_major_version=3.2
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for vivaldi"
 arch=('x86_64')
@@ -11,25 +11,23 @@ url="https://ffmpeg.org/"
 license=('LGPL2.1')
 depends=('glibc')
 makedepends=(
-  'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
+  'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2' 'python'
   'xdg-utils' 'gn'
 )
 options=('!strip')
 source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
 )
-sha512sums=('dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f')
+sha512sums=('23cdd8b49c3276b16f1b4753fadf9f428720f0a95a3f567d189ba0e8a231d7bc1f62e96da6188645243eedac15ecc554b97e83c1a63aa647e7946cc1ba015a8c')
 
 prepare() {
   cd "$srcdir/chromium-$pkgver"
 
-  # Use Python 2
-  find -name '*.py' | xargs sed -e 's|env python|&2|g' -e 's|bin/python|&2|g' -i || true
+  # Force script incompatible with Python 3 to use /usr/bin/python2
+  sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
 
-  # force some 'older' binaries in the path
-  [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
+  # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2
+  ln -s /usr/lib/python3.*/site-packages/xcbgen "$srcdir/"
 
 }
 
@@ -38,7 +36,10 @@ build() {
 
   python2 tools/clang/scripts/update.py
 
-  export PATH="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin:$srcdir/path:$PATH"
+  export PATH="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin:$PATH"
+
+  # ui/gfx/x/gen_xproto.py needs xcbgen
+  export PYTHONPATH=$srcdir
 
   export CC="clang"
   export CXX="clang++"