summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBlackEagle2018-03-01 19:11:48 +0100
committerBlackEagle2018-03-01 19:11:48 +0100
commit8511bbb15bb74c32680433eb7b1f65df8b1fb341 (patch)
treef9726d03787a587214c502169bcf7c20014d25bc
parent4219ec076e911304263ae737aed44a3e536fc98c (diff)
downloadaur-8511bbb15bb74c32680433eb7b1f65df8b1fb341.tar.gz
opera-developer-ffmpeg-codecs :: 65.0.3325.53-1
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD31
-rw-r--r--chromium-gn-r0.patch33
-rw-r--r--chromium-vulkan-r0.patch120
4 files changed, 17 insertions, 180 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b27128bd0f2d..ee83e95be257 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Jan 29 21:48:38 UTC 2018
+# Thu Mar 1 18:11:48 UTC 2018
pkgbase = opera-developer-ffmpeg-codecs
pkgdesc = additional support for proprietary codecs for opera-developer
- pkgver = 65.0.3315.3
+ pkgver = 65.0.3325.53
pkgrel = 1
url = https://ffmpeg.org/
arch = x86_64
@@ -15,18 +15,15 @@ pkgbase = opera-developer-ffmpeg-codecs
makedepends = pciutils
makedepends = python2
makedepends = xdg-utils
+ makedepends = ncurses5-compat-libs
depends = glibc
options = !strip
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3315.3.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.53.tar.xz
source = chromium-last-commit-position-r1.patch
source = chromium-FORTIFY_SOURCE-r2.patch
- source = chromium-gn-r0.patch
- source = chromium-vulkan-r0.patch
- sha512sums = c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
+ sha512sums = 86683bd173292b86871d7bd175a457da0c94589e8283ec3c2ee21c4b3685c5f7013374dd1deff841ea45c747fe85bf8e9ef5c98e2417381e72e73aa3763dd7c9
sha512sums = 8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41
sha512sums = 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c
- sha512sums = de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
- sha512sums = d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16
pkgname = opera-developer-ffmpeg-codecs
diff --git a/PKGBUILD b/PKGBUILD
index 773d8ba8ada9..6015876d85c6 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.3315.3
+pkgver=65.0.3325.53
pkgrel=1
pkgdesc="additional support for proprietary codecs for opera-developer"
arch=('x86_64')
@@ -10,48 +10,41 @@ license=('LGPL2.1')
depends=('glibc')
makedepends=(
'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
- 'xdg-utils'
+ 'xdg-utils' 'ncurses5-compat-libs'
)
options=('!strip')
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=('c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce'
+sha512sums=('86683bd173292b86871d7bd175a457da0c94589e8283ec3c2ee21c4b3685c5f7013374dd1deff841ea45c747fe85bf8e9ef5c98e2417381e72e73aa3763dd7c9'
'8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
- '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c'
- 'de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd'
- 'd16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16')
+ '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c')
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
- # 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"
- ln -s /usr/bin/python2 "$srcdir/python2-path/python"
- # chromium 46 gives an error about a missing file
- # workaround create empty
- touch chrome/test/data/webui/i18n_process_css_test.html
+ # 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"
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() {
cd "$srcdir/chromium-$pkgver"
- export PATH="$srcdir/python2-path:$PATH"
+ python2 tools/clang/scripts/update.py --without-android
- 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 use_custom_libcxx=false"
+ export PATH="$srcdir/path:$PATH"
+
+ local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=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=true clang_use_chrome_plugins=true is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
python2 tools/gn/bootstrap/bootstrap.py -v -s
out/Release/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
diff --git a/chromium-gn-r0.patch b/chromium-gn-r0.patch
deleted file mode 100644
index 8f01e864ce5e..000000000000
--- a/chromium-gn-r0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 4553bb766679..000000000000
--- a/chromium-vulkan-r0.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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"