opera-developer-ffmpeg-codecs :: 58.0.3029.6-1

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

4 files changed, 60 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 806986412630..4ecc2d0762fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon Feb 20 10:33:12 UTC 2017
+# Sun Mar 12 20:41:46 UTC 2017
 pkgbase = opera-developer-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for opera-developer
-	pkgver = 57.0.2987.21
+	pkgver = 58.0.3029.6
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
-	makedepends = gtk2
 	makedepends = gtk3
+	makedepends = gtk2
 	makedepends = libexif
-	makedepends = libpulse
 	makedepends = libxss
 	makedepends = ninja
 	makedepends = nss
@@ -21,10 +20,14 @@ pkgbase = opera-developer-ffmpeg-codecs
 	depends = gcc-libs
 	depends = zlib
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-57.0.2987.21.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.6.tar.xz
 	source = chromium-last-commit-position-r1.patch
-	sha256sums = 632189c16d56fc23e6c3ef8174fd59ee3bae9b1c6a6740bf9a41dfb83cd39c57
+	source = chromium-gn-bootstrap-r2.patch
+	source = chromium-FORTIFY_SOURCE.patch
+	sha256sums = b23136b976a83e0c6948bd2088be6b83969fc5cbe06f68f575012f924537c35b
 	sha256sums = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
+	sha256sums = 64d743c78183c302c42d1f289863e34c74832fca57443833e46a0a3157e2b5de
+	sha256sums = ffc664a90b68600de2d80a4064df25ec6f34fb4443e96ef2f0741ccb49d90a4b
 
 pkgname = opera-developer-ffmpeg-codecs
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f6e0285f1cb..a949f81a3b91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=opera-developer-ffmpeg-codecs
-pkgver=57.0.2987.21
+pkgver=58.0.3029.6
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for opera-developer"
 arch=('i686' 'x86_64')
@@ -9,17 +9,20 @@ url="https://ffmpeg.org/"
 license=('LGPL2.1')
 depends=('gcc-libs' 'zlib')
 makedepends=(
-  'gtk2' 'gtk3' 'libexif' 'libpulse' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
+  'gtk3' 'gtk2' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
   'xdg-utils'
 )
 options=('!strip')
 source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
   'chromium-last-commit-position-r1.patch'
+  'chromium-gn-bootstrap-r2.patch'
+  'chromium-FORTIFY_SOURCE.patch'
 )
-sha256sums=('632189c16d56fc23e6c3ef8174fd59ee3bae9b1c6a6740bf9a41dfb83cd39c57'
-            'd3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e')
-
+sha256sums=('b23136b976a83e0c6948bd2088be6b83969fc5cbe06f68f575012f924537c35b'
+            'd3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e'
+            '64d743c78183c302c42d1f289863e34c74832fca57443833e46a0a3157e2b5de'
+            'ffc664a90b68600de2d80a4064df25ec6f34fb4443e96ef2f0741ccb49d90a4b')
 
 prepare() {
   cd "$srcdir/chromium-$pkgver"
@@ -37,6 +40,8 @@ prepare() {
   touch chrome/test/data/webui/i18n_process_css_test.html
 
   patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
+  patch -p1 -i "$srcdir/chromium-gn-bootstrap-r2.patch"
+  patch -p1 -i "$srcdir/chromium-FORTIFY_SOURCE.patch"
 }
 
 build() {
@@ -44,7 +49,7 @@ build() {
 
   export PATH="$srcdir/python2-path:$PATH"
 
-  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"
+  local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_pulseaudio=false link_pulseaudio=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=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
 
diff --git a/chromium-FORTIFY_SOURCE.patch b/chromium-FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..c6477d690872
--- /dev/null
+++ b/chromium-FORTIFY_SOURCE.patch
@@ -0,0 +1,27 @@
+Drop _FORTIFY_SOURCE=2 from defines
+
+Gentoo toolchains enable this by default. Removing this prevents spammy
+warnings about the macro being redefined.
+
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1069,19 +1069,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer &&
+-        (!is_linux || !is_clang || is_official_build)) {
+-      # _FORTIFY_SOURCE isn't really supported by Clang now, see
+-      # http://llvm.org/bugs/show_bug.cgi?id=16821.
+-      # It seems to work fine with Ubuntu 12 headers though, so use it in
+-      # official builds.
+-      #
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac || is_ios) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
diff --git a/chromium-gn-bootstrap-r2.patch b/chromium-gn-bootstrap-r2.patch
new file mode 100644
index 000000000000..76287e1a56ec
--- /dev/null
+++ b/chromium-gn-bootstrap-r2.patch
@@ -0,0 +1,13 @@
+Index: tools/gn/bootstrap/bootstrap.py
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+       'base/base_switches.cc',
+       'base/build_time.cc',
+       'base/callback_internal.cc',
++      'base/callback_helpers.cc',
+       'base/command_line.cc',
+       'base/debug/activity_tracker.cc',
+       'base/debug/alias.cc',