vivaldi-snapshot-ffmpeg-codecs :: 54.0.2840.59-1

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

3 files changed, 48 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55b3662fa9bd..04f5f4cf8a82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Sep  2 13:32:22 UTC 2016
+# Tue Oct 18 14:37:15 UTC 2016
 pkgbase = vivaldi-snapshot-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for vivaldi
-	pkgver = 53.0.2785.90
+	pkgver = 54.0.2840.59
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = i686
@@ -17,10 +17,13 @@ pkgbase = vivaldi-snapshot-ffmpeg-codecs
 	makedepends = pciutils
 	makedepends = python2
 	makedepends = xdg-utils
-	depends = glibc
+	depends = gcc-libs
+	depends = zlib
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-53.0.2785.90.tar.xz
-	sha256sums = 59d2299e7f0894e88e9ab3c52fd24b4ad4c6d5ac9f4e8e6543a0b46d165d2701
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-54.0.2840.59.tar.xz
+	source = chromium-last-commit-position-r1.patch
+	sha256sums = df89c284b0109566acc6a5a1a84d94a5ab0509cc3a86a31299a50328991edcde
+	sha256sums = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
 
 pkgname = vivaldi-snapshot-ffmpeg-codecs
 
diff --git a/PKGBUILD b/PKGBUILD
index 879d45379a8d..2bb972da8151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=vivaldi-snapshot-ffmpeg-codecs
-pkgver=53.0.2785.90
+pkgver=54.0.2840.59
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for vivaldi"
 arch=('i686' 'x86_64')
 url="https://ffmpeg.org/"
 license=('LGPL2.1')
-depends=('glibc')
+depends=('gcc-libs' 'zlib')
 makedepends=(
   'gtk2' 'libexif' 'libpulse' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
   'xdg-utils'
@@ -15,15 +15,18 @@ makedepends=(
 options=('!strip')
 source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
+  'chromium-last-commit-position-r1.patch'
 )
-sha256sums=('59d2299e7f0894e88e9ab3c52fd24b4ad4c6d5ac9f4e8e6543a0b46d165d2701')
+sha256sums=('df89c284b0109566acc6a5a1a84d94a5ab0509cc3a86a31299a50328991edcde'
+            'd3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e')
 
 
 prepare() {
   cd "$srcdir/chromium-$pkgver"
 
   # Use Python 2
-  find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
+  find . -name '*.py' -exec sed -r 's|/usr/bin/python$|&2|g' -i {} +
+  find . -name '*.py' -exec sed -r 's|/usr/bin/env python$|&2|g' -i {} +
   # There are still a lot of relative calls which need a workaround
   [[ -d "$srcdir/python2-path" ]] && rm -rf "$srcdir/python2-path"
   mkdir "$srcdir/python2-path"
@@ -32,6 +35,8 @@ prepare() {
   # chromium 46 gives an error about a missing file
   # workaround create empty
   touch chrome/test/data/webui/i18n_process_css_test.html
+
+  patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
 }
 
 build() {
@@ -39,25 +44,17 @@ build() {
 
   export PATH="$srcdir/python2-path:$PATH"
 
-  build/gyp_chromium \
-    --depth=. \
-    -Dclang=0 \
-    -Duse_gnome_keyring=0 \
-    -Duse_gconf=0 \
-    -Dlinux_use_bundled_binutils=0 \
-    -Dlinux_use_bundled_gold=0 \
-    -Dlinux_use_gold_flags=0 \
-    -Dsysroot='' \
-    -Dcomponent=shared_library \
-    -Dffmpeg_branding=ChromeOS
+  local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0"
+  python2 tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$args"
+  out/Release/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
 
-  ninja -C out/Release ffmpeg
+  ninja -C out/Release -v media/ffmpeg
 }
 
 package() {
   cd "$srcdir/chromium-$pkgver"
 
-	install -Dm644 out/Release/lib/libffmpeg.so \
+	install -Dm644 out/Release/libffmpeg.so \
     "$pkgdir/opt/vivaldi-snapshot/libffmpeg.so"
 }
 
diff --git a/chromium-last-commit-position-r1.patch b/chromium-last-commit-position-r1.patch
new file mode 100644
index 000000000000..700a86e86b61
--- /dev/null
+++ b/chromium-last-commit-position-r1.patch
@@ -0,0 +1,26 @@
+--- a/tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
++++ b/tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+ 
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+ 
+ namespace {
+ 
+--- a/tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
++++ b/tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+ 
+   deps = [
+     ":gn_lib",
+-    ":last_commit_position",
+     "//base",
+     "//build/config/sanitizers:deps",
+   ]