opera-developer-ffmpeg-codecs :: 86.0.4229.0-1

2 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7355d688af10..4118cdc209a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by mksrcinfo v8
-# Mon Jul 20 21:16:28 UTC 2020
+# Generated by makepkg 5.2.2
+# Wed Aug 26 12:45:18 UTC 2020
 pkgbase = opera-developer-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for opera-developer
-	pkgver = 85.0.4183.26
+	pkgver = 86.0.4229.0
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -14,13 +14,13 @@ pkgbase = opera-developer-ffmpeg-codecs
 	makedepends = nss
 	makedepends = pciutils
 	makedepends = python2
+	makedepends = python
 	makedepends = xdg-utils
 	makedepends = gn
-	makedepends = python2-xcb-proto
 	depends = glibc
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.26.tar.xz
-	sha512sums = 00267e64bcbb8c464fa624e203bbfde9d6dd324d70a83ef903e5cec0332ddf6fd540c742fce99c23931522e57e54e46280cda7dc0e085b33cf2c36ef45bbd935
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4229.0.tar.xz
+	sha512sums = a379884b0b92d7c03e1640d60963d6b6e4fcf07d4afafec7983a14c18ee96684099020b62e579673a81bef9cdebcae634123663faea364eb0554aa019884cf36
 
 pkgname = opera-developer-ffmpeg-codecs
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f51e91034c7..09ce20378fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=opera-developer-ffmpeg-codecs
-pkgver=85.0.4183.26
+pkgver=86.0.4229.0
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for opera-developer"
 arch=('x86_64')
@@ -10,25 +10,23 @@ url="https://ffmpeg.org/"
 license=('LGPL2.1')
 depends=('glibc')
 makedepends=(
-  'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
-  'xdg-utils' 'gn' 'python2-xcb-proto'
+  '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=('00267e64bcbb8c464fa624e203bbfde9d6dd324d70a83ef903e5cec0332ddf6fd540c742fce99c23931522e57e54e46280cda7dc0e085b33cf2c36ef45bbd935')
+sha512sums=('a379884b0b92d7c03e1640d60963d6b6e4fcf07d4afafec7983a14c18ee96684099020b62e579673a81bef9cdebcae634123663faea364eb0554aa019884cf36')
 
 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/"
 
 }
 
@@ -37,16 +35,19 @@ 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++"
 
   local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_platform_hevc=true enable_platform_ac3_eac3_audio=true enable_platform_mpeg_h_audio=true enable_platform_dolby_vision=true enable_mse_mpeg2ts_stream_parser=true use_gnome_keyring=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false clang_use_chrome_plugins=true is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=true"
 
-  gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
+  LC_ALL=C buildtools/linux64/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
 
-  ninja -C out/Release -v media/ffmpeg
+  LC_ALL=C ninja -C out/Release -v media/ffmpeg
 }
 
 package() {