Djam/chromium-browser-stable-slava86
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git synced 2025-02-24 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated from 69 to 70. Refreshed patches. Use bundled ffmpeg to avoid dependency hell with updating system ffmpeg.

Browse source
This commit is contained in:
Mikhail Novosyolov 2018-10-26 18:20:45 +03:00
parent 861444f8c3
commit 8b4ee07354
12 changed files with 217 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Gentoo-compiler-r4.patch → Gentoo-compiler-r5.patch
View file

@ -1,17 +1,17 @@
From 777d166eec22c1894108dce985498f75ac5931e8 Mon Sep 17 00:00:00 2001 From 07fa6b9176dfd1acd4eb6706323ab4823f530432 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org> From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 25 Apr 2018 13:22:49 -0400 Date: Wed, 25 Apr 2018 13:22:49 -0400
Subject: [PATCH] Disable various compiler configs Subject: [PATCH] Disable various compiler configs
--- ---
build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ build/config/compiler/BUILD.gn | 60 ++++++++++------------------------
1 file changed, 18 insertions(+), 43 deletions(-) 1 file changed, 18 insertions(+), 42 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 6e38ad782d38..87bbd423f67f 100644 index 0e796978d479..fa77c2476e4e 100644
--- a/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn
@@ -225,8 +225,6 @@ config("compiler") { @@ -235,8 +235,6 @@ config("compiler") {
configs += [ configs += [
# See the definitions below. # See the definitions below.
@ -20,12 +20,11 @@ index 6e38ad782d38..87bbd423f67f 100644
":compiler_codegen", ":compiler_codegen",
] ]
@@ -488,18 +486,6 @@ config("compiler") { @@ -501,17 +499,6 @@ config("compiler") {
} }
} }
- if (is_clang && !is_nacl && current_toolchain == host_toolchain && - if (is_clang && !is_nacl && !use_xcode_clang) {
- target_os != "chromeos") {
- cflags += [ - cflags += [
- # TODO(hans): Remove this once Clang generates better optimized debug info - # TODO(hans): Remove this once Clang generates better optimized debug info
- # by default. https://crbug.com/765793 - # by default. https://crbug.com/765793
@ -39,7 +38,18 @@ index 6e38ad782d38..87bbd423f67f 100644
# Print absolute paths in diagnostics. There is no precedent for doing this # Print absolute paths in diagnostics. There is no precedent for doing this
# on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
# Windows developers rely on it (crbug.com/636109) so only do this on Windows. # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
@@ -1518,22 +1500,6 @@ config("chromium_code") { @@ -1510,10 +1497,6 @@ config("default_warnings") {
cflags += [
# TODO(thakis): https://crbug.com/753973
"-Wno-enum-compare-switch",
-
- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
- "-Wno-ignored-pragma-optimize",
]
}
}
@@ -1555,22 +1538,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS", "__STDC_FORMAT_MACROS",
] ]
@ -59,10 +69,10 @@ index 6e38ad782d38..87bbd423f67f 100644
- defines += [ "_FORTIFY_SOURCE=2" ] - defines += [ "_FORTIFY_SOURCE=2" ]
- } - }
- -
if (is_mac || is_ios) { if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
@@ -1863,7 +1829,8 @@ config("default_stack_frames") { @@ -1940,7 +1907,8 @@ config("default_stack_frames") {
} }
# Default "optimization on" config. # Default "optimization on" config.
@ -72,7 +82,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_win) { if (is_win) {
# TODO(thakis): Remove is_clang here, https://crbug.com/598772 # TODO(thakis): Remove is_clang here, https://crbug.com/598772
if (is_official_build && full_wpo_on_official && !is_clang) { if (is_official_build && full_wpo_on_official && !is_clang) {
@@ -1897,7 +1864,8 @@ config("optimize") { @@ -1974,7 +1942,8 @@ config("optimize") {
} }
# Same config as 'optimize' but without the WPO flag. # Same config as 'optimize' but without the WPO flag.
@ -82,7 +92,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_win) { if (is_win) {
# Favor size over speed, /O1 must be before the common flags. The GYP # Favor size over speed, /O1 must be before the common flags. The GYP
# build also specifies /Os and /GF but these are implied by /O1. # build also specifies /Os and /GF but these are implied by /O1.
@@ -1920,7 +1888,8 @@ config("optimize_no_wpo") { @@ -1997,7 +1966,8 @@ config("optimize_no_wpo") {
} }
# Turn off optimizations. # Turn off optimizations.
@ -92,7 +102,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_win) { if (is_win) {
cflags = [ cflags = [
"/Od", # Disable optimization. "/Od", # Disable optimization.
@@ -1944,7 +1913,8 @@ config("no_optimize") { @@ -2021,7 +1991,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program # Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and should # optimization and link-time code generation which is very expensive and should
# be used sparingly. # be used sparingly.
@ -102,7 +112,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_nacl && is_nacl_irt) { if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config. # The NaCl IRT is a special case and always wants its own config.
# Various components do: # Various components do:
@@ -1991,7 +1961,8 @@ config("optimize_max") { @@ -2068,7 +2039,8 @@ config("optimize_max") {
# #
# TODO(crbug.com/621335) - rework how all of these configs are related # TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer. # so that we don't need this disclaimer.
@ -112,7 +122,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_nacl && is_nacl_irt) { if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config. # The NaCl IRT is a special case and always wants its own config.
# Various components do: # Various components do:
@@ -2029,7 +2000,8 @@ config("optimize_speed") { @@ -2106,7 +2078,8 @@ config("optimize_speed") {
} }
} }
@ -122,7 +132,7 @@ index 6e38ad782d38..87bbd423f67f 100644
cflags = [ "-O1" ] + common_optimize_on_cflags cflags = [ "-O1" ] + common_optimize_on_cflags
ldflags = common_optimize_on_ldflags ldflags = common_optimize_on_ldflags
visibility = [ ":default_optimization" ] visibility = [ ":default_optimization" ]
@@ -2115,7 +2087,8 @@ config("afdo") { @@ -2192,7 +2165,8 @@ config("afdo") {
# configs += [ "//build/config/compiler:symbols" ] # configs += [ "//build/config/compiler:symbols" ]
# Full symbols. # Full symbols.
@ -132,7 +142,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_win) { if (is_win) {
if (use_goma || is_clang) { if (use_goma || is_clang) {
# Note that with VC++ this requires is_win_fastlink, enforced elsewhere. # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
@@ -2213,7 +2186,8 @@ config("symbols") { @@ -2290,7 +2264,8 @@ config("symbols") {
# Minimal symbols. # Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to user # This config guarantees to hold symbol for stack trace which are shown to user
# when crash happens in unittests running on buildbot. # when crash happens in unittests running on buildbot.
@ -142,7 +152,7 @@ index 6e38ad782d38..87bbd423f67f 100644
if (is_win) { if (is_win) {
# Linker symbols for backtraces only. # Linker symbols for backtraces only.
cflags = [] cflags = []
@@ -2244,7 +2218,8 @@ config("minimal_symbols") { @@ -2330,7 +2305,8 @@ config("minimal_symbols") {
} }
# No symbols. # No symbols.
@ -153,5 +163,4 @@ index 6e38ad782d38..87bbd423f67f 100644
cflags = [ "-g0" ] cflags = [ "-g0" ]
asmflags = cflags asmflags = cflags
-- --
2.18.0 2.19.0

3
UBUNTU-define__libc_malloc.patch
View file

@ -5,7 +5,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/base/process/memory_linux.cc --- a/base/process/memory_linux.cc
+++ b/base/process/memory_linux.cc +++ b/base/process/memory_linux.cc
@@ -42,6 +42,12 @@ void OnNoMemory() { @@ -48,6 +48,12 @@ void OnNoMemory() {
} // namespace } // namespace
@ -18,3 +18,4 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
void EnableTerminationOnHeapCorruption() { void EnableTerminationOnHeapCorruption() {
// On Linux, there nothing to do AFAIK. // On Linux, there nothing to do AFAIK.
} }

15
UBUNTU-fix-extra-arflags.patch
View file

@ -3,22 +3,21 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/build/toolchain/gcc_toolchain.gni --- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni
@@ -339,7 +339,7 @@ template("gcc_toolchain") { @@ -318,7 +318,7 @@ template("gcc_toolchain") {
# We use slightly different arflags for AIX.
extra_arflags = "-r -c -s"
} else { } else {
- extra_arflags = "-r -c -s -D" rspfile = "{{output}}.rsp"
+ extra_arflags = "rcsD" rspfile_content = "{{inputs}}"
- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
+ command = "\"$ar\" {{arflags}} rcsD {{output}} @\"$rspfile\""
} }
# Almost all targets build with //build/config/compiler:thin_archive which # Remove the output file first so that ar doesn't try to modify the
--- a/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn
@@ -1642,7 +1642,6 @@ config("thin_archive") { @@ -1689,7 +1689,6 @@ config("thin_archive") {
# have a "thin archive" mode (it does accept -T, but it means truncating # have a "thin archive" mode (it does accept -T, but it means truncating
# archive names to 16 characters, which is not what we want). # archive names to 16 characters, which is not what we want).
if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
- arflags = [ "-T" ] - arflags = [ "-T" ]
} }
} }

8
UBUNTU-set-rpath-on-chromium-executables.patch
View file

@ -4,7 +4,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1718885
--- a/chrome/BUILD.gn --- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn +++ b/chrome/BUILD.gn
@@ -286,6 +286,8 @@ if (!is_android && !is_mac) { @@ -291,6 +291,8 @@ if (!is_android && !is_mac) {
rebase_path(version_script, root_build_dir) ] rebase_path(version_script, root_build_dir) ]
} }
@ -23,6 +23,6 @@ Bug-Ubuntu: https://launchpad.net/bugs/1718885
+ configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+ } + }
+ +
if (is_linux && (is_component_build || using_sanitizer) && configs += [
use_custom_libcxx) { "//v8:external_startup_data",
deps += [ "//buildtools/third_party/libc++:libc++" ] ":disable_icf",

11
UBUNTU-suppress-newer-clang-warning-flags.patch
View file

@ -4,7 +4,7 @@ Description: Do not use warning flags that require a newer Clang (bionic has 6.0
--- a/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn
@@ -668,8 +668,7 @@ config("compiler") { @@ -719,8 +719,7 @@ config("compiler") {
# This flag enforces that member pointer base types are complete. It helps # This flag enforces that member pointer base types are complete. It helps
# prevent us from running into problems in the Microsoft C++ ABI (see # prevent us from running into problems in the Microsoft C++ ABI (see
# https://crbug.com/847724). # https://crbug.com/847724).
@ -14,12 +14,3 @@ Description: Do not use warning flags that require a newer Clang (bionic has 6.0
cflags += [ "-fcomplete-member-pointers" ] cflags += [ "-fcomplete-member-pointers" ]
} }
@@ -1468,7 +1467,7 @@ config("default_warnings") {
# Ignore warnings about MSVC optimization pragmas.
# TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
- "-Wno-ignored-pragma-optimize",
+ #"-Wno-ignored-pragma-optimize",
]
}
}

28
chromium-50-system-ffmpeg-3.patch
View file

@ -1,28 +0,0 @@
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-22 23:02:39.000000000 +0100
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-23 18:51:16.810699343 +0100
@@ -15,9 +15,9 @@
#include <limits>
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
} // extern "C"
#include "api/video/i420_buffer.h"
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-23 18:55:39.080894319 +0100
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-23 18:54:32.178123691 +0100
@@ -17,7 +17,7 @@
#include "modules/video_coding/codecs/h264/include/h264.h"
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
} // extern "C"
#include "common_video/h264/h264_bitstream_parser.h"

59
chromium-browser-stable.spec
View file

@ -23,7 +23,6 @@
%define _src %{_topdir}/SOURCES %define _src %{_topdir}/SOURCES
%define chromium_system_libs 1 %define chromium_system_libs 1
%define ffmpeg 1
%define icu 0 %define icu 0
%define libva 1 %define libva 1
%define clang 1 %define clang 1
@ -38,8 +37,8 @@
Summary: A fast web browser based on the Blink engine Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable Name: chromium-browser-stable
Version: 69.0.3497.100 Version: 70.0.3538.77
Release: 7 Release: 1
License: BSD, LGPL License: BSD, LGPL
Group: Networking/WWW Group: Networking/WWW
Url: https://www.chromium.org/Home Url: https://www.chromium.org/Home
@ -59,32 +58,26 @@ Source999: new-system-icons.tar.xz
Patch4: chromium-30.0.1599.66-master-prefs-path.patch Patch4: chromium-30.0.1599.66-master-prefs-path.patch
Patch22: chromium-54-proprietary-codecs-assert.patch Patch22: chromium-54-proprietary-codecs-assert.patch
%if 0%{jsoncpp}
# (cjw) add missing unbundle gn files (1)
Patch28: chromium-53-gn-system-icu-jsoncpp.patch
%endif
# (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio. # (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio.
Patch32: chromium-55-extra-media.patch Patch32: chromium-55-extra-media.patch
# (cjw) fix webrtc build with system ffmpeg
Patch35: chromium-50-system-ffmpeg-3.patch
# (cjw) fix build with current glib... # (cjw) fix build with current glib...
Patch36: chromium-58-glib.patch Patch36: chromium-58-glib.patch
# New from Debian # New from Debian
Patch500: chromium-third-party-cookies-off-by-default.patch Patch500: chromium-third-party-cookies-off-by-default.patch
Patch501: chromium-ps-print.patch Patch501: chromium-ps-print.patch
# Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55. # Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55.
# :P
Patch502: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch Patch502: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch
# fix build with icu other than 54 # fix build with icu other than 54
Patch504: chromium-system-icu-r0.patch Patch504: chromium-system-icu-r0.patch
# https://aur.archlinux.org/packages/chromium-vaapi/ # https://aur.archlinux.org/packages/chromium-vaapi/
# https://github.com/saiarcot895/chromium-ubuntu-build # https://github.com/saiarcot895/chromium-ubuntu-build
Patch508: chromium-vaapi-r20.patch # openSUSE-libva1.patch must be applied after chromium-vaapi-r*.patch
Patch509: chromium-widevine-r2.patch Patch508: chromium-vaapi-r21.patch
# ROSA Build Patch509: openSUSE-libva1.patch
Patch600: chromium-buildname-60.0.3112.90.patch Patch510: chromium-widevine-r2.patch
# Patch to fix build # Patch to fix build
Patch601: chromium-62-include-cstdlib.patch Patch601: chromium-62-include-cstdlib.patch
# Equal to Ubuntu's patches/fix-ffmpeg-ia32-build.patch
Patch605: chromium-ffmpeg-ebp-r1.patch Patch605: chromium-ffmpeg-ebp-r1.patch
# Add "ROSA" to the user agent string # Add "ROSA" to the user agent string
Patch627: chromium-68.0.3440.106-rosa-user-agent.patch Patch627: chromium-68.0.3440.106-rosa-user-agent.patch
@ -105,7 +98,9 @@ Patch750: UBUNTU-fix-extra-arflags.patch
Patch751: UBUNTU-touch-v35.patch Patch751: UBUNTU-touch-v35.patch
# Patch753 does not work # Patch753 does not work
Patch753: ROSA-allow-Gold-on-Linux.patch Patch753: ROSA-allow-Gold-on-Linux.patch
Patch754: Gentoo-compiler-r4.patch Patch754: Gentoo-compiler-r5.patch
Patch755: openSUSE-system-libusb.patch
Patch756: openSUSE-libusb_interrupt_event_handler.patch
Provides: %{crname} = %{EVRD} Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable Conflicts: chromium-browser-unstable
@ -146,9 +141,6 @@ BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
%if 0%{?ffmpeg}
BuildRequires: pkgconfig(libavcodec) >= 4.0.2
%endif
BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
@ -176,6 +168,7 @@ BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libusb-1.0)
%if 0%{?libva} %if 0%{?libva}
BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva)
%endif %endif
@ -291,13 +284,7 @@ members of the Chromium and WebDriver teams.
%patch4 -p1 -b .prefs %patch4 -p1 -b .prefs
%patch22 -p1 %patch22 -p1
%if 0%{jsoncpp}
%patch28 -p1
%endif
%patch32 -p1 %patch32 -p1
%if 0%{?ffmpeg}
%patch35 -p1
%endif
%patch36 -p1 %patch36 -p1
%if 0%{icu} %if 0%{icu}
@ -306,13 +293,18 @@ members of the Chromium and WebDriver teams.
%endif %endif
%if 0%{?libva} %if 0%{?libva}
%patch508 -p1 -b .vaapi %define vaapi_version %(cat %{_includedir}/va/va_version.h | grep '#define VA_MAJOR_VERSION ' | awk '{print $NF}')
%patch508 -p1 -b .vaapiMain
# We have libva1 in rosa2016.1, but will have libva2 in rosa2019.1
# This patch is needed for libva1 only (where VA_MAJOR_VERSION = 0)
%if vaapi_version < 1
%patch509 -p1 -b .vaapi1
%endif
%endif %endif
%patch500 -p1 %patch500 -p1
%patch501 -p1 %patch501 -p1
%patch509 -p1 %patch510 -p1
%patch600 -p1
%patch601 -p1 %patch601 -p1
%patch605 -p1 %patch605 -p1
%patch627 -p1 %patch627 -p1
@ -330,11 +322,17 @@ members of the Chromium and WebDriver teams.
%patch751 -p1 %patch751 -p1
#patch753 -p1 #patch753 -p1
%patch754 -p1 %patch754 -p1
%patch755 -p1
%patch756 -p1
# hack for libusb stuff (from openSUSE)
rm -rf third_party/libusb/src/libusb/libusb.h
cp -a %{_includedir}/libusb-1.0/libusb.h third_party/libusb/src/libusb/libusb.h
mkdir -p third_party/llvm-build/Release+Asserts/bin mkdir -p third_party/llvm-build/Release+Asserts/bin
pushd third_party/llvm-build/Release+Asserts/bin pushd third_party/llvm-build/Release+Asserts/bin
ln -sf /usr/bin/clang clang ln -sf "$(which clang)" clang
ln -sf /usr/bin/clang++ clang++ ln -sf "$(which clang++)" clang++
popd popd
# Remove bundled ICU; its header files appear to get picked up instead of # Remove bundled ICU; its header files appear to get picked up instead of
@ -487,8 +485,9 @@ CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-v
#is_nacl_glibc=false \ #is_nacl_glibc=false \
#fatal_linker_warnings=false \ #fatal_linker_warnings=false \
%define system_gn_list ffmpeg flac libxslt snappy yasm libdrm fontconfig freetype harfbuzz-ng %define system_gn_list flac libxslt snappy yasm libdrm fontconfig freetype harfbuzz-ng libusb
# libpng, libtiff # libpng, libtiff
# ffmpeg
# libvpx : system libvpx will normally be much older than the bundled one # libvpx : system libvpx will normally be much older than the bundled one
# opus # opus
# icu # icu

11
chromium-buildname-60.0.3112.90.patch
View file

@ -1,11 +0,0 @@
--- chromium-60.0.3112.20.old/components/version_ui_strings.grdp 2017-06-08 16:55:00.495103433 +0200
+++ chromium-60.0.3112.20/components/version_ui_strings.grdp 2017-06-08 16:55:36.027102220 +0200
@@ -7,7 +7,7 @@
Official Build
</message>
<message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
- Developer Build
+ Сборка ROSA
</message>
<message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
(32-bit)

77
chromium-vaapi-r20.patch → chromium-vaapi-r21.patch
View file

@ -1,5 +1,5 @@
From e95d904578c265a84f117d7d5eff598423f9283d Mon Sep 17 00:00:00 2001 From e95d904578c265a84f117d7d5eff598423f9283d Mon Sep 17 00:00:00 2001
From: Daniel Charles <daniel.charles@intel.com> From: Daniel Charles
Date: Fri, 09 Feb 2018 14:39:27 -0800 Date: Fri, 09 Feb 2018 14:39:27 -0800
Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
@ -31,12 +31,12 @@ TEST=subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171 Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
Signed-off-by: Daniel Charles <daniel.charles@intel.com> Signed-off-by: Daniel Charles
--- ---
--- a/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -1273,12 +1273,14 @@ const FeatureEntry kFeatureEntries[] = { @@ -1429,12 +1429,14 @@ const FeatureEntry kFeatureEntries[] = {
{"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
flag_descriptions::kUiPartialSwapDescription, kOsAll, flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@ -51,7 +51,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"enable-webrtc-hw-h264-encoding", {"enable-webrtc-hw-h264-encoding",
flag_descriptions::kWebrtcHwH264EncodingName, flag_descriptions::kWebrtcHwH264EncodingName,
flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS, flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
@@ -1647,6 +1649,13 @@ const FeatureEntry kFeatureEntries[] = { @@ -1815,6 +1817,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kShowTouchHudDescription, kOsCrOS, flag_descriptions::kShowTouchHudDescription, kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)}, SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
#endif // OS_CHROMEOS #endif // OS_CHROMEOS
@ -65,7 +65,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{ {
"disable-accelerated-video-decode", "disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName, flag_descriptions::kAcceleratedVideoDecodeName,
@@ -1654,6 +1663,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -1822,6 +1831,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid, kOsMac | kOsWin | kOsCrOS | kOsAndroid,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
}, },
@ -73,7 +73,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#if defined(OS_WIN) #if defined(OS_WIN)
{"enable-hdr", flag_descriptions::kEnableHDRName, {"enable-hdr", flag_descriptions::kEnableHDRName,
flag_descriptions::kEnableHDRDescription, kOsWin, flag_descriptions::kEnableHDRDescription, kOsWin,
@@ -2326,12 +2336,17 @@ const FeatureEntry kFeatureEntries[] = { @@ -2501,12 +2511,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)}, FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR #endif // ENABLE_OPENVR
#endif // ENABLE_VR #endif // ENABLE_VR
@ -145,15 +145,15 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode"; const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
const char kAcceleratedVideoDecodeDescription[] = const char kAcceleratedVideoDecodeDescription[] =
"Hardware-accelerated video decode where available."; "Hardware-accelerated video decode where available.";
@@ -1986,6 +1993,7 @@ const char kWebrtcEchoCanceller3Name[] = @@ -2121,6 +2128,7 @@ const char kWebrtcHybridAgcName[] = "Web
const char kWebrtcEchoCanceller3Description[] = const char kWebrtcHybridAgcDescription[] =
"Experimental WebRTC echo canceller (AEC3)."; "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding"; const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
const char kWebrtcHwDecodingDescription[] = const char kWebrtcHwDecodingDescription[] =
"Support in WebRTC for decoding video streams using platform hardware."; "Support in WebRTC for decoding video streams using platform hardware.";
@@ -1993,6 +2001,7 @@ const char kWebrtcHwDecodingDescription[ @@ -2128,6 +2136,7 @@ const char kWebrtcHwDecodingDescription[
const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding"; const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
const char kWebrtcHwEncodingDescription[] = const char kWebrtcHwEncodingDescription[] =
"Support in WebRTC for encoding video streams using platform hardware."; "Support in WebRTC for encoding video streams using platform hardware.";
@ -161,7 +161,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding"; const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
const char kWebrtcHwH264EncodingDescription[] = const char kWebrtcHwH264EncodingDescription[] =
@@ -2892,14 +2901,16 @@ const char kTabStripKeyboardFocusDescrip @@ -3059,14 +3068,16 @@ const char kTextSuggestionsTouchBarDescr
// Chrome OS ------------------------------------------------------------------- // Chrome OS -------------------------------------------------------------------
@ -192,7 +192,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
extern const char kAcceleratedVideoDecodeName[]; extern const char kAcceleratedVideoDecodeName[];
extern const char kAcceleratedVideoDecodeDescription[]; extern const char kAcceleratedVideoDecodeDescription[];
@@ -1762,13 +1766,17 @@ extern const char kPermissionPromptPersi @@ -1849,13 +1853,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
@ -215,7 +215,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/content/browser/gpu/compositor_util.cc --- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc
@@ -149,7 +149,11 @@ const GpuFeatureData GetGpuFeatureData( @@ -150,7 +150,11 @@ const GpuFeatureData GetGpuFeatureData(
{"video_decode", {"video_decode",
SafeGetFeatureStatus(gpu_feature_info, SafeGetFeatureStatus(gpu_feature_info,
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@ -229,7 +229,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
true, true}, true, true},
--- a/content/browser/gpu/gpu_process_host.cc --- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc
@@ -209,7 +209,9 @@ static const char* const kSwitchNames[] @@ -210,7 +210,9 @@ static const char* const kSwitchNames[]
switches::kDisableLogging, switches::kDisableLogging,
switches::kDisableShaderNameHashing, switches::kDisableShaderNameHashing,
switches::kDisableSkiaRuntimeOpts, switches::kDisableSkiaRuntimeOpts,
@ -241,7 +241,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#endif #endif
--- a/content/browser/renderer_host/media/video_capture_browsertest.cc --- a/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ b/content/browser/renderer_host/media/video_capture_browsertest.cc +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -165,8 +165,13 @@ class VideoCaptureBrowserTest : public C @@ -166,8 +166,13 @@ class VideoCaptureBrowserTest : public C
base::CommandLine::ForCurrentProcess()->AppendSwitch( base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeJpegDecodeAccelerator); switches::kUseFakeJpegDecodeAccelerator);
} else { } else {
@ -257,7 +257,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2799,7 +2799,11 @@ void RenderProcessHostImpl::PropagateBro @@ -2932,7 +2932,11 @@ void RenderProcessHostImpl::PropagateBro
switches::kDefaultTileHeight, switches::kDefaultTileHeight,
switches::kDisable2dCanvasImageChromium, switches::kDisable2dCanvasImageChromium,
switches::kDisableAcceleratedJpegDecoding, switches::kDisableAcceleratedJpegDecoding,
@ -269,7 +269,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kDisableBackgroundTasks, switches::kDisableBackgroundTasks,
switches::kDisableBackgroundTimerThrottling, switches::kDisableBackgroundTimerThrottling,
switches::kDisableBreakpad, switches::kDisableBreakpad,
@@ -2936,8 +2940,10 @@ void RenderProcessHostImpl::PropagateBro @@ -3072,8 +3076,10 @@ void RenderProcessHostImpl::PropagateBro
#if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
switches::kDisableMojoRenderer, switches::kDisableMojoRenderer,
#endif #endif
@ -298,7 +298,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
private: private:
--- a/content/gpu/BUILD.gn --- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn
@@ -133,4 +133,8 @@ target(link_target_type, "gpu_sources") @@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) { (!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ] configs += [ "//build/config/linux/dri" ]
} }
@ -309,7 +309,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
} }
--- a/content/gpu/gpu_main.cc --- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc
@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& pa @@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain"); base::PlatformThread::SetName("CrGpuMain");
@ -318,7 +318,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Set thread priority before sandbox initialization. // Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif #endif
@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& pa @@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
GetContentClient()->SetGpuInfo(gpu_init->gpu_info()); GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL; base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@ -329,7 +329,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/content/public/browser/gpu_utils.cc --- a/content/public/browser/gpu_utils.cc
+++ b/content/public/browser/gpu_utils.cc +++ b/content/public/browser/gpu_utils.cc
@@ -57,9 +57,17 @@ const gpu::GpuPreferences GetGpuPreferen @@ -58,9 +58,17 @@ const gpu::GpuPreferences GetGpuPreferen
gpu_preferences.in_process_gpu = gpu_preferences.in_process_gpu =
command_line->HasSwitch(switches::kInProcessGPU); command_line->HasSwitch(switches::kInProcessGPU);
gpu_preferences.disable_accelerated_video_decode = gpu_preferences.disable_accelerated_video_decode =
@ -349,7 +349,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
gpu::GpuPreferences::VPX_VENDOR_MICROSOFT; gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
--- a/content/public/common/content_switches.cc --- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc
@@ -79,6 +79,11 @@ const char kDisable3DAPIs[] @@ -64,6 +64,11 @@ const char kDisable3DAPIs[]
// Disable gpu-accelerated 2d canvas. // Disable gpu-accelerated 2d canvas.
const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas"; const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
@ -361,7 +361,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Disables hardware acceleration of video decode, where available. // Disables hardware acceleration of video decode, where available.
const char kDisableAcceleratedVideoDecode[] = const char kDisableAcceleratedVideoDecode[] =
"disable-accelerated-video-decode"; "disable-accelerated-video-decode";
@@ -868,11 +873,13 @@ const char kWaitForDebuggerChildren[] @@ -853,11 +858,13 @@ const char kWaitForDebuggerChildren[]
// ignores this switch on its stable and beta channels. // ignores this switch on its stable and beta channels.
const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption"; const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
@ -377,7 +377,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// See https://tools.ietf.org/html/rfc7714 for further information. // See https://tools.ietf.org/html/rfc7714 for further information.
--- a/content/public/common/content_switches.h --- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h
@@ -104,6 +104,9 @@ CONTENT_EXPORT extern const char kDisabl @@ -102,6 +102,9 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDomAutomationController[]; CONTENT_EXPORT extern const char kDomAutomationController[];
extern const char kDisable2dCanvasClipAntialiasing[]; extern const char kDisable2dCanvasClipAntialiasing[];
CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[]; CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@ -387,7 +387,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[]; CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[]; CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
CONTENT_EXPORT extern const char kEnableAutomation[]; CONTENT_EXPORT extern const char kEnableAutomation[];
@@ -241,8 +244,10 @@ CONTENT_EXPORT extern const char kValida @@ -239,8 +242,10 @@ CONTENT_EXPORT extern const char kValida
CONTENT_EXPORT extern const char kWaitForDebuggerChildren[]; CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
CONTENT_EXPORT extern const char kDisableWebRtcEncryption[]; CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
@ -421,7 +421,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -1441,7 +1441,11 @@ media::GpuVideoAcceleratorFactories* Ren @@ -1415,7 +1415,11 @@ media::GpuVideoAcceleratorFactories* Ren
kGpuStreamPriorityMedia); kGpuStreamPriorityMedia);
const bool enable_video_accelerator = const bool enable_video_accelerator =
@ -435,7 +435,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
gpu::kGpuFeatureStatusEnabled); gpu::kGpuFeatureStatusEnabled);
--- a/gpu/config/software_rendering_list.json --- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json +++ b/gpu/config/software_rendering_list.json
@@ -377,17 +377,6 @@ @@ -374,17 +374,6 @@
] ]
}, },
{ {
@ -455,7 +455,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
"cr_bugs": [145531, 332596, 571899, 629434], "cr_bugs": [145531, 332596, 571899, 629434],
--- a/media/gpu/BUILD.gn --- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn +++ b/media/gpu/BUILD.gn
@@ -495,6 +495,14 @@ if (use_v4l2_codec || use_vaapi || is_ma @@ -501,6 +501,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
} }
} }
@ -470,7 +470,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
if (use_vaapi) { if (use_vaapi) {
test("jpeg_encode_accelerator_unittest") { test("jpeg_encode_accelerator_unittest") {
deps = [ deps = [
@@ -559,6 +567,10 @@ if (use_v4l2_codec || use_vaapi) { @@ -571,6 +579,10 @@ if (use_v4l2_codec || use_vaapi) {
if (use_ozone) { if (use_ozone) {
deps += [ "//ui/ozone" ] deps += [ "//ui/ozone" ]
} }
@ -483,7 +483,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/media/base/media_switches.cc --- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -117,10 +117,15 @@ const char kUseFileForFakeAudioCapture[] @@ -108,10 +108,15 @@ const char kUseFileForFakeAudioCapture[]
// accelerator hardware to be present. // accelerator hardware to be present.
const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator"; const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator";
@ -499,7 +499,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// When running tests on a system without the required hardware or libraries, // When running tests on a system without the required hardware or libraries,
// this flag will cause the tests to fail. Otherwise, they silently succeed. // this flag will cause the tests to fail. Otherwise, they silently succeed.
@@ -462,15 +467,22 @@ const base::Feature kPreloadMediaEngagem @@ -460,15 +465,22 @@ const base::Feature kPreloadMediaEngagem
#endif #endif
bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
@ -526,7 +526,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
return false; return false;
--- a/media/base/media_switches.h --- a/media/base/media_switches.h
+++ b/media/base/media_switches.h +++ b/media/base/media_switches.h
@@ -66,7 +66,11 @@ MEDIA_EXPORT extern const char kUseFakeD @@ -64,7 +64,11 @@ MEDIA_EXPORT extern const char kUseFakeD
MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[]; MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[]; MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[]; MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[];
@ -540,7 +540,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
MEDIA_EXPORT extern const char kMuteAudio[]; MEDIA_EXPORT extern const char kMuteAudio[];
--- a/content/browser/utility_process_host.cc --- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc
@@ -296,7 +296,11 @@ bool UtilityProcessHost::StartProcess() @@ -304,7 +304,11 @@ bool UtilityProcessHost::StartProcess()
switches::kOverrideUseSoftwareGLForTests, switches::kOverrideUseSoftwareGLForTests,
switches::kOverrideEnabledCdmInterfaceVersion, switches::kOverrideEnabledCdmInterfaceVersion,
switches::kProxyServer, switches::kProxyServer,
@ -552,14 +552,3 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kUseFakeDeviceForMediaStream, switches::kUseFakeDeviceForMediaStream,
switches::kUseFakeJpegDecodeAccelerator, switches::kUseFakeJpegDecodeAccelerator,
switches::kUseFileForFakeVideoCapture, switches::kUseFileForFakeVideoCapture,
--- chromium-69.0.3497.92.orig/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc 2018-09-11 21:09:48.000000000 +0200
+++ chromium-69.0.3497.92/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc 2018-09-12 08:48:49.606320048 +0200
@@ -174,7 +174,7 @@ bool VaapiJpegDecodeAccelerator::OutputP
VAImage image = {};
VAImageFormat format = {};
- format.fourcc = VA_FOURCC_I420;
+ format.fourcc = libyuv::FOURCC_I420;
format.byte_order = VA_LSB_FIRST;
format.bits_per_pixel = 12; // 12 for I420

16
openSUSE-libusb_interrupt_event_handler.patch Normal file
View file

@ -0,0 +1,16 @@
diff -up chromium-48.0.2564.116/device/usb/usb_context.cc.modern-libusbx chromium-48.0.2564.116/device/usb/usb_context.cc
--- chromium-48.0.2564.116/device/usb/usb_context.cc.modern-libusbx 2016-02-24 10:21:10.534996028 -0500
+++ chromium-48.0.2564.116/device/usb/usb_context.cc 2016-02-24 10:22:28.270499864 -0500
@@ -57,7 +57,11 @@ void UsbContext::UsbEventHandler::Run()
void UsbContext::UsbEventHandler::Stop() {
base::subtle::Release_Store(&running_, 0);
+#ifdef LIBUSB_API_VERSION >= 0x01000105
+ libusb_interrupt_event_handler(context_);
+#else
libusb_interrupt_handle_event(context_);
+#endif
}
UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {

19
openSUSE-libva1.patch Normal file
View file

@ -0,0 +1,19 @@
# Fix compatibility with VA-API library (libva) version 1
# Chromium seems to use version 2 or newer
# Source: https://build.opensuse.org/package/view_file/network:chromium/chromium/chromium-libva1.patch
# (mikhailnov) We put it on top of chromium-vaapi-r21.patch (https://aur.archlinux.org/cgit/aur.git/tree/chromium-vaapi-r21.patch?h=chromium-vaapi)
Index: chromium-70.0.3538.67/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
===================================================================
--- chromium-70.0.3538.67.orig/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
+++ chromium-70.0.3538.67/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
@@ -295,7 +295,8 @@ bool VaapiJpegDecodeAccelerator::Initial
// TODO(crbug.com/828119): Try a list of possible supported formats rather
// than hardcoding the format to I420 here.
va_image_format_ = base::WrapUnique(new VAImageFormat{});
- va_image_format_->fourcc = VA_FOURCC_I420;
+ const uint32_t kI420Fourcc = VA_FOURCC('I', '4', '2', '0');
+ va_image_format_->fourcc = kI420Fourcc;
va_image_format_->byte_order = VA_LSB_FIRST;
va_image_format_->bits_per_pixel = 12;

41
openSUSE-system-libusb.patch Normal file
View file

@ -0,0 +1,41 @@
Index: chromium-70.0.3538.54/build/linux/unbundle/libusb.gn
===================================================================
--- /dev/null
+++ chromium-70.0.3538.54/build/linux/unbundle/libusb.gn
@@ -0,0 +1,24 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_libusb") {
+ packages = [ "libusb-1.0" ]
+}
+
+shim_headers("libusb_shim") {
+ root_path = "src/libusb"
+ headers = [
+ "libusb.h",
+ ]
+}
+
+source_set("libusb") {
+ deps = [
+ ":libusb_shim",
+ ]
+ public_configs = [ ":system_libusb" ]
+}
Index: chromium-70.0.3538.54/build/linux/unbundle/replace_gn_files.py
===================================================================
--- chromium-70.0.3538.54.orig/build/linux/unbundle/replace_gn_files.py
+++ chromium-70.0.3538.54/build/linux/unbundle/replace_gn_files.py
@@ -27,6 +27,7 @@ REPLACEMENTS = {
'libevent': 'base/third_party/libevent/BUILD.gn',
'libjpeg': 'third_party/libjpeg.gni',
'libpng': 'third_party/libpng/BUILD.gn',
+ 'libusb': 'third_party/libusb/BUILD.gn',
'libvpx': 'third_party/libvpx/BUILD.gn',
'libwebp': 'third_party/libwebp/BUILD.gn',
'libxml': 'third_party/libxml/BUILD.gn',