[arch-commits] Commit in opera-ffmpeg-codecs/trunk (PKGBUILD)

[Ike Devolder]

    Date: Thursday, August 6, 2020 @ 06:21:14
  Author: idevolder
Revision: 670531

upgpkg: opera-ffmpeg-codecs 84.0.4147.105-1

Modified:
  opera-ffmpeg-codecs/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-06 06:20:17 UTC (rev 670530)
+++ PKGBUILD	2020-08-06 06:21:14 UTC (rev 670531)
@@ -2,7 +2,7 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=opera-ffmpeg-codecs
-pkgver=83.0.4103.116
+pkgver=84.0.4147.105
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for opera"
 arch=('x86_64')
@@ -10,7 +10,7 @@
 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')
@@ -17,18 +17,16 @@
 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/"
 
 }
 
@@ -37,20 +35,16 @@
 
   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"
 
-  #(
-    #cd third_party/ffmpeg
-    #chromium/scripts/build_ffmpeg.py linux x64 --branding ChromeOS
-    #chromium/scripts/copy_config.sh
-    #chromium/scripts/generate_gn.py
-  #)
-
   gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
 
   ninja -C out/Release -v media/ffmpeg