summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBlackEagle2018-01-19 15:01:36 +0100
committerBlackEagle2018-01-19 15:01:36 +0100
commit8410791b22bc53b5f5ffbd27b052a2b58151b736 (patch)
tree906b200a64a23d252c01cba26bfab943e5671a26
parent9336b7b529b154e3dd2f21bb3e5648bacf368a67 (diff)
downloadaur-8410791b22bc53b5f5ffbd27b052a2b58151b736.tar.gz
vivaldi-snapshot-ffmpeg-codecs :: 64.0.3282.85-1
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD16
-rw-r--r--chromium-angle-r0.patch89
-rw-r--r--chromium-memcpy-r0.patch35
4 files changed, 141 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 72a8de991e4..2dda9d9782f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Dec 8 06:22:16 UTC 2017
+# Fri Jan 19 14:01:36 UTC 2018
pkgbase = vivaldi-snapshot-ffmpeg-codecs
pkgdesc = additional support for proprietary codecs for vivaldi
- pkgver = 62.0.3202.97
+ pkgver = 64.0.3282.85
pkgrel = 1
url = https://ffmpeg.org/
arch = x86_64
@@ -17,16 +17,16 @@ pkgbase = vivaldi-snapshot-ffmpeg-codecs
makedepends = xdg-utils
depends = glibc
options = !strip
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3202.97.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.85.tar.xz
source = chromium-last-commit-position-r1.patch
- source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
- source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r17.patch
- source = chromium-gcc5-r2.patch
- sha512sums = 2f8c7e9a17f25670bd3ceb557149185329d372873b75584f57486f26326d8c0fb7849807b46ace0be563a4aebf4a2be4ceeae4fe30cf5da7dcb1068ab1b7ebd1
+ source = chromium-FORTIFY_SOURCE-r2.patch
+ source = chromium-memcpy-r0.patch
+ source = chromium-angle-r0.patch
+ sha512sums = 52842b4f8304b4eb4e8fb25b586e0d03af5a5d0aebe2fc9ae517f97e05ee5ece3f71fd2b48a4f148fccec859b13c98a669ccbb4183d99ebd3bcf7e617ca241d0
sha512sums = 8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41
sha512sums = 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c
- sha512sums = 28812a8bd6d591831a3bbd749f1d7c6dd434eb0237970d4e8ea8cfd48fa8efb4d98906eca3d175218fe62c50bcb0b6472b2d7dfdde73d5641cd3fde1d9dc5f3b
- sha512sums = 55723ffe9c34b5336450e75db8354c1ce5d6429b7296cbf575941eef5f3de3cdc40836e8f9b6905b4153913b10136a12d4c6d37f6a9f447677aa40588bfac182
+ sha512sums = 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
+ sha512sums = c5fa18dbaa82a0fc089c6c88857089f19c83f6d3ff7c7034e6ca3cde20f1615cd84ac13fde14b55dcfa7d3c85eb0f023fbe337bb96d7d8199b5729b269a5ccc7
pkgname = vivaldi-snapshot-ffmpeg-codecs
diff --git a/PKGBUILD b/PKGBUILD
index 44be1d2289b..a4c04dc628a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
pkgname=vivaldi-snapshot-ffmpeg-codecs
-pkgver=62.0.3202.97
+pkgver=64.0.3282.85
pkgrel=1
pkgdesc="additional support for proprietary codecs for vivaldi"
arch=('x86_64')
@@ -17,14 +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-bootstrap-r17.patch'
- 'chromium-gcc5-r2.patch'
+ 'chromium-memcpy-r0.patch'
+ 'chromium-angle-r0.patch'
)
-sha512sums=('2f8c7e9a17f25670bd3ceb557149185329d372873b75584f57486f26326d8c0fb7849807b46ace0be563a4aebf4a2be4ceeae4fe30cf5da7dcb1068ab1b7ebd1'
+sha512sums=('52842b4f8304b4eb4e8fb25b586e0d03af5a5d0aebe2fc9ae517f97e05ee5ece3f71fd2b48a4f148fccec859b13c98a669ccbb4183d99ebd3bcf7e617ca241d0'
'8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
'2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c'
- '28812a8bd6d591831a3bbd749f1d7c6dd434eb0237970d4e8ea8cfd48fa8efb4d98906eca3d175218fe62c50bcb0b6472b2d7dfdde73d5641cd3fde1d9dc5f3b'
- '55723ffe9c34b5336450e75db8354c1ce5d6429b7296cbf575941eef5f3de3cdc40836e8f9b6905b4153913b10136a12d4c6d37f6a9f447677aa40588bfac182')
+ '1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a'
+ 'c5fa18dbaa82a0fc089c6c88857089f19c83f6d3ff7c7034e6ca3cde20f1615cd84ac13fde14b55dcfa7d3c85eb0f023fbe337bb96d7d8199b5729b269a5ccc7')
prepare() {
cd "$srcdir/chromium-$pkgver"
@@ -43,8 +43,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-bootstrap-r17.patch"
- patch -p1 -i "$srcdir/chromium-gcc5-r2.patch"
+ patch -p1 -i "$srcdir/chromium-memcpy-r0.patch"
+ patch -p1 -i "$srcdir/chromium-angle-r0.patch"
}
build() {
diff --git a/chromium-angle-r0.patch b/chromium-angle-r0.patch
new file mode 100644
index 00000000000..462b8ae4443
--- /dev/null
+++ b/chromium-angle-r0.patch
@@ -0,0 +1,89 @@
+From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
+From: Kai Ninomiya <kainino@chromium.org>
+Date: Wed, 06 Dec 2017 14:06:53 -0800
+Subject: [PATCH] Mark StaticType related functions as constexpr
+
+Fixes compilation on some versions of GCC and probably Clang.
+
+Follow-up to http://crrev.com/c/786317
+
+Bug: angleproject:1432
+Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
+Reviewed-on: https://chromium-review.googlesource.com/812220
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Kai Ninomiya <kainino@chromium.org>
+---
+
+diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
+index e26e5ff..30b391a 100644
+--- a/third_party/angle/src/compiler/translator/StaticType.h
++++ b/third_party/angle/src/compiler/translator/StaticType.h
+@@ -160,7 +160,7 @@
+ TPrecision precision,
+ TQualifier qualifier,
+ unsigned char secondarySize>
+-const TType *GetForVecMatHelper(unsigned char primarySize)
++constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
+ {
+ static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+ basicType == EbtBool,
+@@ -186,7 +186,7 @@
+ template <TBasicType basicType,
+ TPrecision precision = EbpUndefined,
+ TQualifier qualifier = EvqGlobal>
+-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
++constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
+ {
+ static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+ basicType == EbtBool,
+@@ -208,7 +208,7 @@
+ }
+
+ template <TBasicType basicType, TPrecision precision = EbpUndefined>
+-const TType *GetForVec(TQualifier qualifier, unsigned char size)
++constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
+ {
+ switch (qualifier)
+ {
+diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+index adf1e4e..90d4c15 100644
+--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
++++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+@@ -236,7 +236,7 @@
+ pop();
+ }
+
+-bool IsGenType(const TType *type)
++constexpr bool IsGenType(const TType *type)
+ {
+ if (type)
+ {
+@@ -248,7 +248,7 @@
+ return false;
+ }
+
+-bool IsVecType(const TType *type)
++constexpr bool IsVecType(const TType *type)
+ {
+ if (type)
+ {
+diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
+index 04f46f1..a54d447 100644
+--- a/third_party/angle/src/compiler/translator/Types.h
++++ b/third_party/angle/src/compiler/translator/Types.h
+@@ -142,13 +142,13 @@
+ {
+ }
+
+- TBasicType getBasicType() const { return type; }
++ constexpr TBasicType getBasicType() const { return type; }
+ void setBasicType(TBasicType t);
+
+ TPrecision getPrecision() const { return precision; }
+ void setPrecision(TPrecision p) { precision = p; }
+
+- TQualifier getQualifier() const { return qualifier; }
++ constexpr TQualifier getQualifier() const { return qualifier; }
+ void setQualifier(TQualifier q) { qualifier = q; }
+
+ bool isInvariant() const { return invariant; }
diff --git a/chromium-memcpy-r0.patch b/chromium-memcpy-r0.patch
new file mode 100644
index 00000000000..dd2fd57d26a
--- /dev/null
+++ b/chromium-memcpy-r0.patch
@@ -0,0 +1,35 @@
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Thu, 7 Dec 2017 22:33:34 +0000
+Subject: [PATCH] memcpy used without including string.h
+
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
+memcpy without including string.h.
+
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
+Reviewed-on: https://chromium-review.googlesource.com/813737
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: vmpstr <vmpstr@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#522579}
+---
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
+index 9e4660c685ee..95ad50b1a338 100644
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+
++#include <string.h>
++
+ namespace cc {
+
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+--
+2.15.1
+