We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 16
chromium-ffmpeg-extra.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Fri Sep 21 20:49:51 UTC 2018 - fisiu@opensuse.org
4
+
5
+- Update to 69.0.3497.100.
6
+
7
+-------------------------------------------------------------------
8
Sat Mar 24 00:09:38 UTC 2018 - fisiu@opensuse.org
9
10
- Make symlink to allow Opera find libffmpeg.so.
11
chromium-ffmpeg-extra.spec
Changed
85
1
2
3
4
Name: chromium-ffmpeg-extra
5
-Version: 64.0.3282.134
6
+Version: 69.0.3497.100
7
Release: 0
8
Summary: Extra ffmpeg codecs for browsers based on Chromium
9
License: GPL-2.0
10
11
URL: http://code.google.com/p/chromium/
12
Source0: http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
13
Source1: BUILD.gn
14
-Patch0: chromium-last-commit-position-r0.patch
15
+Patch0: fix_building_widevinecdm_with_chromium.patch
16
Patch1: chromium-dma-buf.patch
17
-Patch2: chromium-angle.patch
18
-Patch3: chromium-memcpy.patch
19
+Patch2: chromium-non-void-return.patch
20
+Patch3: chromium-system-icu.patch
21
+Patch4: chromium-skia-system-fontconfig.patch
22
BuildRequires: ninja
23
BuildRequires: pkgconfig
24
BuildRequires: python-xml
25
26
BuildRequires: pkgconfig(libpulse)
27
BuildRequires: pkgconfig(nss)
28
BuildRequires: pkgconfig(python)
29
+BuildRequires: pkgconfig(uuid)
30
BuildRequires: pkgconfig(xscrnsaver)
31
BuildRequires: pkgconfig(xtst)
32
ExclusiveArch: %{ix86} x86_64
33
34
%patch1 -p1
35
%patch2 -p1
36
%patch3 -p1
37
+%patch4 -p1
38
39
mkdir toolchain
40
cp %{SOURCE1} toolchain/BUILD.gn
41
42
43
%build
44
ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"
45
-export CFLAGS="${ARCH_FLAGS} -std=gnu11 -fpermissive"
46
+export CFLAGS="${ARCH_FLAGS} -fpermissive"
47
export CXXFLAGS="${ARCH_FLAGS} -fpermissive"
48
%if 0%{?suse_version} < 1330
49
export CC=gcc-7
50
51
export CXX=g++
52
%endif
53
54
-ninjaproc="%{?jobs:%{jobs}}"
55
-
56
myconf_gn=""
57
myconf_gn+=" custom_toolchain=\"./toolchain:default\""
58
-myconf_gn+=" ffmpeg_branding=\"Chrome\""
59
+myconf_gn+=" ffmpeg_branding=\"ChromeOS\""
60
myconf_gn+=" proprietary_codecs=true"
61
myconf_gn+=" enable_swiftshader=false"
62
myconf_gn+=" enable_hevc_demuxing=true"
63
myconf_gn+=" use_custom_libcxx=false"
64
-myconf_gn+=" use_gconf=false"
65
myconf_gn+=" use_gio=false"
66
myconf_gn+=" use_gnome_keyring=false"
67
myconf_gn+=" use_kerberos=false"
68
69
myconf_gn+=" is_component_build=true"
70
myconf_gn+=" is_debug=false"
71
myconf_gn+=" symbol_level=0"
72
-myconf_gn+=" enable_vulkan=false" # fails to compile now
73
+myconf_gn+=" enable_vulkan=true"
74
+myconf_gn+=" use_system_freetype=true"
75
+myconf_gn+=" is_component_ffmpeg=true"
76
77
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
78
out/Release/gn gen --args="${myconf_gn}" out/Release
79
out/Release/gn args --list out/Release/
80
-ninja -j $ninjaproc -C out/Release media/ffmpeg
81
+ninja %{?_smp_mflags} -C out/Release media/ffmpeg
82
83
%install
84
install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so
85
chromium-angle.patch
Deleted
91
1
2
-From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
3
-From: Kai Ninomiya <kainino@chromium.org>
4
-Date: Wed, 06 Dec 2017 14:06:53 -0800
5
-Subject: [PATCH] Mark StaticType related functions as constexpr
6
-
7
-Fixes compilation on some versions of GCC and probably Clang.
8
-
9
-Follow-up to http://crrev.com/c/786317
10
-
11
-Bug: angleproject:1432
12
-Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
13
-Reviewed-on: https://chromium-review.googlesource.com/812220
14
-Reviewed-by: Jamie Madill <jmadill@chromium.org>
15
-Commit-Queue: Kai Ninomiya <kainino@chromium.org>
16
----
17
-
18
-diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
19
-index e26e5ff..30b391a 100644
20
---- a/third_party/angle/src/compiler/translator/StaticType.h
21
-+++ b/third_party/angle/src/compiler/translator/StaticType.h
22
-@@ -160,7 +160,7 @@
23
- TPrecision precision,
24
- TQualifier qualifier,
25
- unsigned char secondarySize>
26
--const TType *GetForVecMatHelper(unsigned char primarySize)
27
-+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
28
- {
29
- static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
30
- basicType == EbtBool,
31
-@@ -186,7 +186,7 @@
32
- template <TBasicType basicType,
33
- TPrecision precision = EbpUndefined,
34
- TQualifier qualifier = EvqGlobal>
35
--const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
36
-+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
37
- {
38
- static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
39
- basicType == EbtBool,
40
-@@ -208,7 +208,7 @@
41
- }
42
-
43
- template <TBasicType basicType, TPrecision precision = EbpUndefined>
44
--const TType *GetForVec(TQualifier qualifier, unsigned char size)
45
-+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
46
- {
47
- switch (qualifier)
48
- {
49
-diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
50
-index adf1e4e..90d4c15 100644
51
---- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
52
-+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
53
-@@ -236,7 +236,7 @@
54
- pop();
55
- }
56
-
57
--bool IsGenType(const TType *type)
58
-+constexpr bool IsGenType(const TType *type)
59
- {
60
- if (type)
61
- {
62
-@@ -248,7 +248,7 @@
63
- return false;
64
- }
65
-
66
--bool IsVecType(const TType *type)
67
-+constexpr bool IsVecType(const TType *type)
68
- {
69
- if (type)
70
- {
71
-diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
72
-index 04f46f1..a54d447 100644
73
---- a/third_party/angle/src/compiler/translator/Types.h
74
-+++ b/third_party/angle/src/compiler/translator/Types.h
75
-@@ -142,13 +142,13 @@
76
- {
77
- }
78
-
79
-- TBasicType getBasicType() const { return type; }
80
-+ constexpr TBasicType getBasicType() const { return type; }
81
- void setBasicType(TBasicType t);
82
-
83
- TPrecision getPrecision() const { return precision; }
84
- void setPrecision(TPrecision p) { precision = p; }
85
-
86
-- TQualifier getQualifier() const { return qualifier; }
87
-+ constexpr TQualifier getQualifier() const { return qualifier; }
88
- void setQualifier(TQualifier q) { qualifier = q; }
89
-
90
- bool isInvariant() const { return invariant; }
91
chromium-last-commit-position-r0.patch
Deleted
32
1
2
-Index: chromium-60.0.3107.4/tools/gn/gn_main.cc
3
-===================================================================
4
---- chromium-60.0.3107.4.orig/tools/gn/gn_main.cc
5
-+++ chromium-60.0.3107.4/tools/gn/gn_main.cc
6
-@@ -12,13 +12,7 @@
7
- #include "tools/gn/standard_out.h"
8
- #include "tools/gn/switches.h"
9
-
10
--// Only the GN-generated build makes this header for now.
11
--// TODO(brettw) consider adding this if we need it in GYP.
12
--#if defined(GN_BUILD)
13
--#include "tools/gn/last_commit_position.h"
14
--#else
15
- #define LAST_COMMIT_POSITION "UNKNOWN"
16
--#endif
17
-
18
- namespace {
19
-
20
-Index: chromium-60.0.3107.4/tools/gn/BUILD.gn
21
-===================================================================
22
---- chromium-60.0.3107.4.orig/tools/gn/BUILD.gn
23
-+++ chromium-60.0.3107.4/tools/gn/BUILD.gn
24
-@@ -268,7 +268,6 @@ executable("gn") {
25
-
26
- deps = [
27
- ":gn_lib",
28
-- ":last_commit_position",
29
- "//base",
30
- "//build/config:exe_and_shlib_deps",
31
- "//build/win:default_exe_manifest",
32
chromium-memcpy.patch
Deleted
37
1
2
-From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
3
-From: Tomas Popela <tomas.popela@gmail.com>
4
-Date: Thu, 7 Dec 2017 22:33:34 +0000
5
-Subject: [PATCH] memcpy used without including string.h
6
-
7
-Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
8
-memcpy without including string.h.
9
-
10
-Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
11
-Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
12
-Reviewed-on: https://chromium-review.googlesource.com/813737
13
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
14
-Reviewed-by: vmpstr <vmpstr@chromium.org>
15
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
16
-Cr-Commit-Position: refs/heads/master@{#522579}
17
----
18
- cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
19
- 1 file changed, 2 insertions(+)
20
-
21
-diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
22
-index 9e4660c685ee..95ad50b1a338 100644
23
---- a/cc/paint/raw_memory_transfer_cache_entry.cc
24
-+++ b/cc/paint/raw_memory_transfer_cache_entry.cc
25
-@@ -4,6 +4,8 @@
26
-
27
- #include "cc/paint/raw_memory_transfer_cache_entry.h"
28
-
29
-+#include <string.h>
30
-+
31
- namespace cc {
32
-
33
- ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
34
---
35
-2.15.1
36
-
37
chromium-non-void-return.patch
Added
201
1
2
+Index: chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
3
+===================================================================
4
+--- chromium-69.0.3497.57.orig/media/gpu/vaapi/vaapi_wrapper.cc
5
++++ chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
6
+@@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
7
+ case VaapiWrapper::kCodecModeMax:
8
+ NOTREACHED();
9
+ return VAEntrypointVLD;
10
++ default:
11
++ return 0;
12
+ }
13
+ }
14
+
15
+Index: chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
16
+===================================================================
17
+--- chromium-69.0.3497.57.orig/cc/input/snap_fling_controller.cc
18
++++ chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
19
+@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor
20
+ case GestureScrollType::kEnd: {
21
+ return state_ == State::kActive || state_ == State::kFinished;
22
+ }
23
++ default:
24
++ return false;
25
+ }
26
+ }
27
+
28
+Index: chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
29
+===================================================================
30
+--- chromium-69.0.3497.57.orig/chrome/browser/ui/webui/discards/discards_ui.cc
31
++++ chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
32
+@@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy
33
+ return mojom::LifecycleUnitVisibility::OCCLUDED;
34
+ case content::Visibility::VISIBLE:
35
+ return mojom::LifecycleUnitVisibility::VISIBLE;
36
++ default:
37
++ return mojom::LifecycleUnitVisibility::VISIBLE;
38
+ }
39
+ #if defined(COMPILER_MSVC)
40
+ NOTREACHED();
41
+Index: chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
42
+===================================================================
43
+--- chromium-69.0.3497.57.orig/components/autofill/core/browser/autofill_manager.cc
44
++++ chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
45
+@@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType(
46
+
47
+ default:
48
+ NOTREACHED();
49
++ return PopupType::kUnspecified;
50
+ }
51
+ }
52
+
53
+Index: chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
54
+===================================================================
55
+--- chromium-69.0.3497.57.orig/components/cast_channel/cast_message_util.cc
56
++++ chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
57
+@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt
58
+ return "unavailable";
59
+ case GetAppAvailabilityResult::kUnknown:
60
+ return "unknown";
61
++ default:
62
++ return "unknown";
63
+ }
64
+ }
65
+
66
+Index: chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
67
+===================================================================
68
+--- chromium-69.0.3497.57.orig/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
69
++++ chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
70
+@@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn
71
+ return PageloadMetrics_ConnectionType_CONNECTION_NONE;
72
+ case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
73
+ return PageloadMetrics_ConnectionType_CONNECTION_BLUETOOTH;
74
++ default:
75
++ return PageloadMetrics_ConnectionType_CONNECTION_UNKNOWN;
76
+ }
77
+ }
78
+
79
+@@ -351,6 +353,8 @@ RequestInfo_Protocol ProtoRequestInfoPro
80
+ return RequestInfo_Protocol_QUIC;
81
+ case DataReductionProxyData::RequestInfo::Protocol::UNKNOWN:
82
+ return RequestInfo_Protocol_UNKNOWN;
83
++ default:
84
++ return RequestInfo_Protocol_UNKNOWN;
85
+ }
86
+ }
87
+
88
+Index: chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
89
+===================================================================
90
+--- chromium-69.0.3497.57.orig/content/browser/cache_storage/cache_storage_quota_client.cc
91
++++ chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
92
+@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo
93
+ return kServiceWorkerCache;
94
+ case CacheStorageOwner::kBackgroundFetch:
95
+ return kBackgroundFetch;
96
++ default:
97
++ return kBackgroundFetch;
98
+ }
99
+ }
100
+
101
+Index: chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
102
+===================================================================
103
+--- chromium-69.0.3497.57.orig/media/capture/video/video_capture_device_descriptor.cc
104
++++ chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
105
+@@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor
106
+ return "Virtual Device";
107
+ case VideoCaptureApi::UNKNOWN:
108
+ return "Unknown";
109
++ default:
110
++ return "Unknown";
111
+ }
112
+ }
113
+
114
+Index: chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
115
+===================================================================
116
+--- chromium-69.0.3497.57.orig/net/nqe/network_quality_estimator.cc
117
++++ chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
118
+@@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator:
119
+ case nqe::internal::OBSERVATION_CATEGORY_COUNT:
120
+ NOTREACHED();
121
+ return base::TimeDelta();
122
++ default:
123
++ return base::TimeDelta();
124
+ }
125
+ }
126
+
127
+Index: chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
128
+===================================================================
129
+--- chromium-69.0.3497.57.orig/services/audio/public/cpp/audio_system_to_service_adapter.cc
130
++++ chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
131
+@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action)
132
+ return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID";
133
+ case kGetInputDeviceInfo:
134
+ return "AudioSystemToServiceAdapter::GetInputDeviceInfo";
135
++ default:
136
++ return "Unknown";
137
+ }
138
+ NOTREACHED();
139
+ }
140
+Index: chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
141
+===================================================================
142
+--- chromium-69.0.3497.57.orig/services/network/cross_origin_read_blocking.cc
143
++++ chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
144
+@@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn
145
+ return sniffers_.empty() && !found_blockable_content_;
146
+ case kBlock:
147
+ return false;
148
++ default:
149
++ return true;
150
+ }
151
+ }
152
+
153
+@@ -811,6 +813,8 @@ bool CrossOriginReadBlocking::ResponseAn
154
+ return sniffers_.empty() && found_blockable_content_;
155
+ case kBlock:
156
+ return true;
157
++ default:
158
++ return false;
159
+ }
160
+ }
161
+
162
+Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
163
+===================================================================
164
+--- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
165
++++ chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
166
+@@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo
167
+ return kAXTextPositionSubscript;
168
+ case EVerticalAlign::kSuper:
169
+ return kAXTextPositionSuperscript;
170
++ default:
171
++ return AXNodeObject::GetTextPosition();
172
+ }
173
+ }
174
+
175
+Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
176
+===================================================================
177
+--- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/webaudio/audio_param.cc
178
++++ chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
179
+@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName()
180
+ return custom_param_name_;
181
+ default:
182
+ NOTREACHED();
183
++ return "Unknown";
184
+ }
185
+ }
186
+
187
+Index: chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
188
+===================================================================
189
+--- chromium-69.0.3497.57.orig/ui/accessibility/platform/ax_platform_node_auralinux.cc
190
++++ chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
191
+@@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
192
+ case ax::mojom::Role::kPresentational:
193
+ case ax::mojom::Role::kUnknown:
194
+ return ATK_ROLE_REDUNDANT_OBJECT;
195
++ default:
196
++ return ATK_ROLE_REDUNDANT_OBJECT;
197
+ }
198
+ }
199
+
200
+Index: chromium-69.0.3497.57/chrome/browser/chrome_browser_main.cc
201
chromium-skia-system-fontconfig.patch
Added
79
1
2
+--- chromium-69.0.3493.3.old/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2018-07-25 16:42:39.217368047 +0200
3
++++ chromium-69.0.3493.3/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2018-07-25 16:44:03.387793112 +0200
4
+@@ -112,8 +112,6 @@
5
+ : fGetVarDesignCoordinates(nullptr)
6
+ , fGetVarAxisFlags(nullptr)
7
+ , fLibrary(nullptr)
8
+- , fIsLCDSupported(false)
9
+- , fLCDExtra(0)
10
+ {
11
+ if (FT_New_Library(&gFTMemory, &fLibrary)) {
12
+ return;
13
+@@ -173,12 +171,7 @@
14
+ }
15
+ #endif
16
+
17
+- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
18
+- // The default has changed over time, so this doesn't mean the same thing to all users.
19
+- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
20
+- fIsLCDSupported = true;
21
+- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
22
+- }
23
++ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
24
+ }
25
+ ~FreeTypeLibrary() {
26
+ if (fLibrary) {
27
+@@ -187,8 +180,6 @@
28
+ }
29
+
30
+ FT_Library library() { return fLibrary; }
31
+- bool isLCDSupported() { return fIsLCDSupported; }
32
+- int lcdExtra() { return fLCDExtra; }
33
+
34
+ // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
35
+ // Prior to this there was no way to get the coordinates out of the FT_Face.
36
+@@ -205,8 +196,6 @@
37
+
38
+ private:
39
+ FT_Library fLibrary;
40
+- bool fIsLCDSupported;
41
+- int fLCDExtra;
42
+
43
+ // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
44
+ // The following platforms provide FreeType of at least 2.4.0.
45
+@@ -704,17 +693,6 @@
46
+ rec->fTextSize = SkIntToScalar(1 << 14);
47
+ }
48
+
49
+- if (isLCD(*rec)) {
50
+- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
51
+- SkAutoMutexAcquire ama(gFTMutex);
52
+- ref_ft_library();
53
+- if (!gFTLibrary->isLCDSupported()) {
54
+- // If the runtime Freetype library doesn't support LCD, disable it here.
55
+- rec->fMaskFormat = SkMask::kA8_Format;
56
+- }
57
+- unref_ft_library();
58
+- }
59
+-
60
+ SkPaint::Hinting h = rec->getHinting();
61
+ if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
62
+ // collapse full->normal hinting if we're not doing LCD
63
+@@ -1109,11 +1087,11 @@
64
+ void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
65
+ if (isLCD(fRec)) {
66
+ if (fLCDIsVert) {
67
+- glyph->fHeight += gFTLibrary->lcdExtra();
68
+- glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
69
++ glyph->fHeight += 2;
70
++ glyph->fTop -= 1;
71
+ } else {
72
+- glyph->fWidth += gFTLibrary->lcdExtra();
73
+- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
74
++ glyph->fWidth += 2;
75
++ glyph->fLeft -= 1;
76
+ }
77
+ }
78
+ }
79
chromium-system-icu.patch
Added
13
1
2
+--- chromium-70.0.3521.2.old/third_party/blink/renderer/platform/text/character_property_data_generator.h 2018-08-15 12:41:21.091987662 +0200
3
++++ chromium-70.0.3521.2/third_party/blink/renderer/platform/text/character_property_data_generator.h 2018-08-17 12:37:45.459538308 +0200
4
+@@ -247,7 +247,7 @@
5
+ 0xFFA0, 0xFFDC,
6
+ };
7
+
8
+-static const UChar32 kIsHangulArray[] = {};
9
++static const UChar32 kIsHangulArray[] = {0xFFDC,};
10
+
11
+ } // namespace blink
12
+
13
fix_building_widevinecdm_with_chromium.patch
Added
29
1
2
+diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn
3
+--- chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn 2018-03-20 12:06:16.192778982 +0100
4
++++ chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn 2018-03-20 12:09:54.184846595 +0100
5
+@@ -10,12 +10,6 @@
6
+ import("//media/media_options.gni")
7
+ import("//third_party/widevine/cdm/widevine.gni")
8
+
9
+-# Internal Cast builds set enable_widevine=true to bring in Widevine support.
10
+-# TODO(xhwang): Support component updated CDM on other platforms and remove this
11
+-# assert.
12
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
13
+- "Component updated CDM only supported on Windows and Mac for now.")
14
+-
15
+ widevine_arch = current_cpu
16
+ if (widevine_arch == "x86") {
17
+ widevine_arch = "ia32"
18
+diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h
19
+--- chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-03-20 12:06:16.192778982 +0100
20
++++ chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-03-20 12:08:24.415172133 +0100
21
+@@ -10,6 +10,7 @@
22
+
23
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
24
+
25
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
26
+ #define WIDEVINE_CDM_AVAILABLE
27
+
28
+ #endif // WIDEVINE_CDM_VERSION_H_
29
gcc60-fixes.diff
Deleted
27
1
2
---- a/build/config/compiler/BUILD.gn 2016-08-14 09:59:05.527738286 +0200
3
-+++ b/build/config/compiler/BUILD.gn 2016-08-14 09:59:56.340463935 +0200
4
-@@ -389,6 +389,7 @@
5
- # TODO(thakis): Eventually switch this to c++11 instead,
6
- # http://crbug.com/427584
7
- cflags_cc += [ "-std=gnu++11" ]
8
-+ cflags_cc += [ "-fno-delete-null-pointer-checks" ]
9
- } else if (!is_win && !is_nacl) {
10
- # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11
11
- # or c++11; we technically don't need this toolchain any more, but there
12
-
13
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
14
-index 99f230ce7e9a..de2415d402f5 100644
15
---- a/base/numerics/safe_math_shared_impl.h
16
-+++ b/base/numerics/safe_math_shared_impl.h
17
-@@ -21,8 +21,7 @@
18
- #if !defined(__native_client__) && \
19
- ((defined(__clang__) && \
20
- ((__clang_major__ > 3) || \
21
-- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
22
-- (defined(__GNUC__) && __GNUC__ >= 5))
23
-+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
24
- #include "base/numerics/safe_math_clang_gcc_impl.h"
25
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
26
- #else
27
chromium-64.0.3282.134.tar.xz -> chromium-69.0.3497.100.tar.xz
Changed