opera-developer-ffmpeg-codecs :: 65.0.3315.3-1

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

4 files changed, 170 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb92c366a060..b27128bd0f2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan 16 18:42:59 UTC 2018
+# Mon Jan 29 21:48:38 UTC 2018
 pkgbase = opera-developer-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for opera-developer
-	pkgver = 65.0.3298.3
+	pkgver = 65.0.3315.3
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -17,12 +17,16 @@ pkgbase = opera-developer-ffmpeg-codecs
 	makedepends = xdg-utils
 	depends = glibc
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3298.3.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3315.3.tar.xz
 	source = chromium-last-commit-position-r1.patch
 	source = chromium-FORTIFY_SOURCE-r2.patch
-	sha512sums = f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
+	source = chromium-gn-r0.patch
+	source = chromium-vulkan-r0.patch
+	sha512sums = c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
 	sha512sums = 8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41
 	sha512sums = 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c
+	sha512sums = de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
+	sha512sums = d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16
 
 pkgname = opera-developer-ffmpeg-codecs
 
diff --git a/PKGBUILD b/PKGBUILD
index 22280257f88a..773d8ba8ada9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=opera-developer-ffmpeg-codecs
-pkgver=65.0.3298.3
+pkgver=65.0.3315.3
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for opera-developer"
 arch=('x86_64')
@@ -17,10 +17,14 @@ source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
   'chromium-last-commit-position-r1.patch'
   'chromium-FORTIFY_SOURCE-r2.patch'
+  'chromium-gn-r0.patch'
+  'chromium-vulkan-r0.patch'
 )
-sha512sums=('f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7'
+sha512sums=('c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce'
             '8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
-            '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c')
+            '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c'
+            'de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd'
+            'd16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16')
 
 prepare() {
   cd "$srcdir/chromium-$pkgver"
@@ -38,6 +42,8 @@ prepare() {
 
   patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
   patch -p1 -i "$srcdir/chromium-FORTIFY_SOURCE-r2.patch"
+  patch -p1 -i "$srcdir/chromium-gn-r0.patch"
+  patch -p1 -i "$srcdir/chromium-vulkan-r0.patch"
 }
 
 build() {
diff --git a/chromium-gn-r0.patch b/chromium-gn-r0.patch
new file mode 100644
index 000000000000..8f01e864ce5e
--- /dev/null
+++ b/chromium-gn-r0.patch
@@ -0,0 +1,33 @@
+From 47b25a1f83f8166c6cd5cf1f13bf6dcce125511a Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Tue, 9 Jan 2018 15:23:14 -0800
+Subject: [PATCH] Fix gn bootstrap
+
+BUG=800553
+R=dpranke@chromium.org
+
+Change-Id: I5c1cfeb7542bf990c59451aabcae7c120cbf09c0
+Reviewed-on: https://chromium-review.googlesource.com/858276
+Reviewed-by: Dirk Pranke <dpranke@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#528197}
+---
+ tools/gn/bootstrap/bootstrap.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index a0f32ad31df0..5376c6253a32 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -178,6 +178,11 @@ def build_gn_with_ninja_manually(tempdir, options):
+   root_gen_dir = os.path.join(tempdir, 'gen')
+   mkdir_p(root_gen_dir)
+ 
++  write_buildflag_header_manually(
++      root_gen_dir,
++      'base/synchronization/synchronization_flags.h',
++      {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
++
+   write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h',
+       {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
+ 
diff --git a/chromium-vulkan-r0.patch b/chromium-vulkan-r0.patch
new file mode 100644
index 000000000000..4553bb766679
--- /dev/null
+++ b/chromium-vulkan-r0.patch
@@ -0,0 +1,120 @@
+From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
+From: Jamie Madill <jmadill@chromium.org>
+Date: Mon, 08 Jan 2018 11:15:38 -0500
+Subject: [PATCH] Vulkan: Allow for no .git directory in build.
+
+The SPIRV-Tools 'external revision generate' script is coded such that
+it assumes a .git folder is present. This causes a problem for the
+tarball build. We can fix this by using the same tooling we use for
+ANGLE's commit id script to check if the .git directory is present
+before running the generator. If it is missing, we insert a hard-coded
+dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD
+to check if the current revision needs updating.
+
+Bug: chromium:799620
+Bug: angleproject:2237
+Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55
+Reviewed-on: https://chromium-review.googlesource.com/854255
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Jamie Madill <jmadill@chromium.org>
+---
+
+diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py
+index bbdb810..57651a5 100644
+--- a/third_party/angle/src/commit_id.py
++++ b/third_party/angle/src/commit_id.py
+@@ -23,6 +23,9 @@
+         print("0")
+     sys.exit(0)
+ 
++if len(sys.argv) < 4 or operation != 'gen':
++    sys.exit(usage)
++
+ output_file = sys.argv[3]
+ commit_id_size = 12
+ 
+diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn
+index fe61826..24f5a3a 100644
+--- a/third_party/angle/src/vulkan_support/BUILD.gn
++++ b/third_party/angle/src/vulkan_support/BUILD.gn
+@@ -145,21 +145,40 @@
+   }
+ }
+ 
+-# This could be generalized to a foreach if other revisions are added.
+-action("spirv_tools_external_revision_generate") {
+-  script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
+-  inputs = [
+-    "$spirv_tools_dir/.git/HEAD",
+-    "$spirv_tools_dir/.git/index",
+-  ]
+-  outputs = [
+-    "$vulkan_gen_dir/spirv_tools_commit_id.h",
+-  ]
+-  args = [
+-    "$raw_spirv_tools_dir",
+-    "SPIRV_TOOLS_COMMIT_ID",
+-    "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
+-  ]
++spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
++                                   [
++                                     "check",
++                                     raw_spirv_tools_dir,
++                                   ],
++                                   "value")
++
++spirv_use_commit_id = spirv_git_is_present == 1
++
++if (spirv_use_commit_id) {
++  # This could be generalized to a foreach if other revisions are added.
++  action("spirv_tools_external_revision_generate") {
++    script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
++    inputs = [
++      "$angle_root/DEPS",
++    ]
++    outputs = [
++      "$vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++    args = [
++      "$raw_spirv_tools_dir",
++      "SPIRV_TOOLS_COMMIT_ID",
++      "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++  }
++} else {
++  copy("spirv_tools_external_revision_generate") {
++    sources = [
++      "dummy_spirv_tools_commit_id.h",
++    ]
++    outputs = [
++      "$vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++  }
+ }
+ 
+ config("vulkan_generate_helper_files_config") {
+@@ -864,7 +883,7 @@
+       sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
+     }
+     if (is_linux) {
+-      ldflags =  [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
++      ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
+     }
+   }
+ }
+diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+new file mode 100644
+index 0000000..e1793bd
+--- /dev/null
++++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+@@ -0,0 +1,10 @@
++//
++// Copyright 2018 The ANGLE Project Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++//
++// This file is a dummy file to enable building SPIRV tools when git is absent.
++
++#pragma once
++
++#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"