Packman Build Service PMBS

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

chromium-ffmpeg-extra.spec Changed

@@ -17,7 +17,7 @@
 
 
 Name:           chromium-ffmpeg-extra
-Version:        64.0.3282.134
+Version:        69.0.3497.100
 Release:        0
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
 License: GPL-2.0
@@ -25,10 +25,11 @@
 URL:            http://code.google.com/p/chromium/
 Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
 Source1:        BUILD.gn
-Patch0:         chromium-last-commit-position-r0.patch
+Patch0:         fix_building_widevinecdm_with_chromium.patch
 Patch1:         chromium-dma-buf.patch
-Patch2:         chromium-angle.patch
-Patch3:         chromium-memcpy.patch
+Patch2:         chromium-non-void-return.patch
+Patch3:         chromium-system-icu.patch
+Patch4:         chromium-skia-system-fontconfig.patch
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
 BuildRequires:  python-xml
@@ -41,6 +42,7 @@
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(xscrnsaver)
 BuildRequires:  pkgconfig(xtst)
 ExclusiveArch:  %{ix86} x86_64
@@ -62,6 +64,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 mkdir toolchain
 cp %{SOURCE1} toolchain/BUILD.gn
@@ -72,7 +75,7 @@
 
 %build
 ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"
-export CFLAGS="${ARCH_FLAGS} -std=gnu11 -fpermissive"
+export CFLAGS="${ARCH_FLAGS} -fpermissive"
 export CXXFLAGS="${ARCH_FLAGS} -fpermissive"
 %if 0%{?suse_version} < 1330
 export CC=gcc-7
@@ -87,16 +90,13 @@
 export CXX=g++
 %endif
 
-ninjaproc="%{?jobs:%{jobs}}"
-
 myconf_gn=""
 myconf_gn+=" custom_toolchain=\"./toolchain:default\""
-myconf_gn+=" ffmpeg_branding=\"Chrome\""
+myconf_gn+=" ffmpeg_branding=\"ChromeOS\""
 myconf_gn+=" proprietary_codecs=true"
 myconf_gn+=" enable_swiftshader=false"
 myconf_gn+=" enable_hevc_demuxing=true"
 myconf_gn+=" use_custom_libcxx=false"
-myconf_gn+=" use_gconf=false"
 myconf_gn+=" use_gio=false"
 myconf_gn+=" use_gnome_keyring=false"
 myconf_gn+=" use_kerberos=false"
@@ -110,12 +110,14 @@
 myconf_gn+=" is_component_build=true"
 myconf_gn+=" is_debug=false"
 myconf_gn+=" symbol_level=0"
-myconf_gn+=" enable_vulkan=false" # fails to compile now
+myconf_gn+=" enable_vulkan=true"
+myconf_gn+=" use_system_freetype=true"
+myconf_gn+=" is_component_ffmpeg=true"
 
 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
 out/Release/gn gen --args="${myconf_gn}" out/Release
 out/Release/gn args --list out/Release/
-ninja -j $ninjaproc -C out/Release media/ffmpeg
+ninja %{?_smp_mflags} -C out/Release media/ffmpeg
 
 %install
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so

chromium-angle.patch Deleted

@@ -1,89 +0,0 @@
-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; }

chromium-last-commit-position-r0.patch Deleted

@@ -1,30 +0,0 @@
-Index: chromium-60.0.3107.4/tools/gn/gn_main.cc
-===================================================================
---- chromium-60.0.3107.4.orig/tools/gn/gn_main.cc
-+++ chromium-60.0.3107.4/tools/gn/gn_main.cc
-@@ -12,13 +12,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
- 
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
- 
- namespace {
- 
-Index: chromium-60.0.3107.4/tools/gn/BUILD.gn
-===================================================================
---- chromium-60.0.3107.4.orig/tools/gn/BUILD.gn
-+++ chromium-60.0.3107.4/tools/gn/BUILD.gn
-@@ -268,7 +268,6 @@ executable("gn") {
- 
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config:exe_and_shlib_deps",
-     "//build/win:default_exe_manifest",

chromium-memcpy.patch Deleted

@@ -1,35 +0,0 @@
-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
-

chromium-non-void-return.patch Added

@@ -0,0 +1,507 @@
+Index: chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/media/gpu/vaapi/vaapi_wrapper.cc
++++ chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
+     case VaapiWrapper::kCodecModeMax:
+       NOTREACHED();
+       return VAEntrypointVLD;
++    default:
++      return 0;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/cc/input/snap_fling_controller.cc
++++ chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
+@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor
+     case GestureScrollType::kEnd: {
+       return state_ == State::kActive || state_ == State::kFinished;
+     }
++    default:
++      return false;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/chrome/browser/ui/webui/discards/discards_ui.cc
++++ chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
+@@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy
+       return mojom::LifecycleUnitVisibility::OCCLUDED;
+     case content::Visibility::VISIBLE:
+       return mojom::LifecycleUnitVisibility::VISIBLE;
++    default:
++      return mojom::LifecycleUnitVisibility::VISIBLE;
+   }
+ #if defined(COMPILER_MSVC)
+   NOTREACHED();
+Index: chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/components/autofill/core/browser/autofill_manager.cc
++++ chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
+@@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType(
+ 
+     default:
+       NOTREACHED();
++      return PopupType::kUnspecified;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/components/cast_channel/cast_message_util.cc
++++ chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
+@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt
+       return "unavailable";
+     case GetAppAvailabilityResult::kUnknown:
+       return "unknown";
++    default:
++      return "unknown";
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
++++ chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
+@@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn
+       return PageloadMetrics_ConnectionType_CONNECTION_NONE;
+     case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
+       return PageloadMetrics_ConnectionType_CONNECTION_BLUETOOTH;
++    default:
++      return PageloadMetrics_ConnectionType_CONNECTION_UNKNOWN;
+   }
+ }
+ 
+@@ -351,6 +353,8 @@ RequestInfo_Protocol ProtoRequestInfoPro
+       return RequestInfo_Protocol_QUIC;
+     case DataReductionProxyData::RequestInfo::Protocol::UNKNOWN:
+       return RequestInfo_Protocol_UNKNOWN;
++    default:
++      return RequestInfo_Protocol_UNKNOWN;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/content/browser/cache_storage/cache_storage_quota_client.cc
++++ chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
+@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo
+       return kServiceWorkerCache;
+     case CacheStorageOwner::kBackgroundFetch:
+       return kBackgroundFetch;
++    default:
++      return kBackgroundFetch;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/media/capture/video/video_capture_device_descriptor.cc
++++ chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
+@@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor
+       return "Virtual Device";
+     case VideoCaptureApi::UNKNOWN:
+       return "Unknown";
++    default:
++      return "Unknown";
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/net/nqe/network_quality_estimator.cc
++++ chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
+@@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator:
+     case nqe::internal::OBSERVATION_CATEGORY_COUNT:
+       NOTREACHED();
+       return base::TimeDelta();
++    default:
++      return base::TimeDelta();
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/services/audio/public/cpp/audio_system_to_service_adapter.cc
++++ chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
+@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action)
+       return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID";
+     case kGetInputDeviceInfo:
+       return "AudioSystemToServiceAdapter::GetInputDeviceInfo";
++    default:
++      return "Unknown";
+   }
+   NOTREACHED();
+ }
+Index: chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/services/network/cross_origin_read_blocking.cc
++++ chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
+@@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn
+       return sniffers_.empty() && !found_blockable_content_;
+     case kBlock:
+       return false;
++    default:
++      return true;
+   }
+ }
+ 
+@@ -811,6 +813,8 @@ bool CrossOriginReadBlocking::ResponseAn
+       return sniffers_.empty() && found_blockable_content_;
+     case kBlock:
+       return true;
++    default:
++      return false;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
++++ chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+@@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo
+       return kAXTextPositionSubscript;
+     case EVerticalAlign::kSuper:
+       return kAXTextPositionSuperscript;
++    default:
++      return AXNodeObject::GetTextPosition();
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/webaudio/audio_param.cc
++++ chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
+@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName()
+       return custom_param_name_;
+     default:
+       NOTREACHED();
++      return "Unknown";
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
+===================================================================
+--- chromium-69.0.3497.57.orig/ui/accessibility/platform/ax_platform_node_auralinux.cc
++++ chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
+     case ax::mojom::Role::kPresentational:
+     case ax::mojom::Role::kUnknown:
+       return ATK_ROLE_REDUNDANT_OBJECT;
++    default:
++      return ATK_ROLE_REDUNDANT_OBJECT;
+   }
+ }
+ 
+Index: chromium-69.0.3497.57/chrome/browser/chrome_browser_main.cc

chromium-skia-system-fontconfig.patch Added

@@ -0,0 +1,77 @@
+--- chromium-69.0.3493.3.old/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2018-07-25 16:42:39.217368047 +0200
++++ chromium-69.0.3493.3/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2018-07-25 16:44:03.387793112 +0200
+@@ -112,8 +112,6 @@
+         : fGetVarDesignCoordinates(nullptr)
+         , fGetVarAxisFlags(nullptr)
+         , fLibrary(nullptr)
+-        , fIsLCDSupported(false)
+-        , fLCDExtra(0)
+     {
+         if (FT_New_Library(&gFTMemory, &fLibrary)) {
+             return;
+@@ -173,12 +171,7 @@
+         }
+ #endif
+ 
+-        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
+-        // The default has changed over time, so this doesn't mean the same thing to all users.
+-        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
+-            fIsLCDSupported = true;
+-            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+-        }
++        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
+     }
+     ~FreeTypeLibrary() {
+         if (fLibrary) {
+@@ -187,8 +180,6 @@
+     }
+ 
+     FT_Library library() { return fLibrary; }
+-    bool isLCDSupported() { return fIsLCDSupported; }
+-    int lcdExtra() { return fLCDExtra; }
+ 
+     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
+     // Prior to this there was no way to get the coordinates out of the FT_Face.
+@@ -205,8 +196,6 @@
+ 
+ private:
+     FT_Library fLibrary;
+-    bool fIsLCDSupported;
+-    int fLCDExtra;
+ 
+     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
+     // The following platforms provide FreeType of at least 2.4.0.
+@@ -704,17 +693,6 @@
+         rec->fTextSize = SkIntToScalar(1 << 14);
+     }
+ 
+-    if (isLCD(*rec)) {
+-        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
+-        SkAutoMutexAcquire ama(gFTMutex);
+-        ref_ft_library();
+-        if (!gFTLibrary->isLCDSupported()) {
+-            // If the runtime Freetype library doesn't support LCD, disable it here.
+-            rec->fMaskFormat = SkMask::kA8_Format;
+-        }
+-        unref_ft_library();
+-    }
+-
+     SkPaint::Hinting h = rec->getHinting();
+     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
+         // collapse full->normal hinting if we're not doing LCD
+@@ -1109,11 +1087,11 @@
+ void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
+     if (isLCD(fRec)) {
+         if (fLCDIsVert) {
+-            glyph->fHeight += gFTLibrary->lcdExtra();
+-            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
++            glyph->fHeight += 2;
++            glyph->fTop -= 1;
+         } else {
+-            glyph->fWidth += gFTLibrary->lcdExtra();
+-            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
++            glyph->fWidth += 2;
++            glyph->fLeft -= 1;
+         }
+     }
+ }

chromium-system-icu.patch Added

fix_building_widevinecdm_with_chromium.patch Added

@@ -0,0 +1,27 @@
+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
+--- chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn	2018-03-20 12:06:16.192778982 +0100
++++ chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn	2018-03-20 12:09:54.184846595 +0100
+@@ -10,12 +10,6 @@
+ import("//media/media_options.gni")
+ import("//third_party/widevine/cdm/widevine.gni")
+ 
+-# Internal Cast builds set enable_widevine=true to bring in Widevine support.
+-# TODO(xhwang): Support component updated CDM on other platforms and remove this
+-# assert.
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+-       "Component updated CDM only supported on Windows and Mac for now.")
+-
+ widevine_arch = current_cpu
+ if (widevine_arch == "x86") {
+   widevine_arch = "ia32"
+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
+--- chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h	2018-03-20 12:06:16.192778982 +0100
++++ chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h	2018-03-20 12:08:24.415172133 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+ 
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ #define WIDEVINE_CDM_AVAILABLE
+ 
+ #endif  // WIDEVINE_CDM_VERSION_H_

gcc60-fixes.diff Deleted

@@ -1,25 +0,0 @@
---- a/build/config/compiler/BUILD.gn    2016-08-14 09:59:05.527738286 +0200
-+++ b/build/config/compiler/BUILD.gn    2016-08-14 09:59:56.340463935 +0200
-@@ -389,6 +389,7 @@
-     # TODO(thakis): Eventually switch this to c++11 instead,
-     # http://crbug.com/427584
-     cflags_cc += [ "-std=gnu++11" ]
-+    cflags_cc += [ "-fno-delete-null-pointer-checks" ]
-   } else if (!is_win && !is_nacl) {
-     # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11
-     # or c++11; we technically don't need this toolchain any more, but there
-
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
-index 99f230ce7e9a..de2415d402f5 100644
---- a/base/numerics/safe_math_shared_impl.h
-+++ b/base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) &&                         \
-     ((defined(__clang__) &&                                \
-       ((__clang_major__ > 3) ||                            \
--       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
--     (defined(__GNUC__) && __GNUC__ >= 5))
-+       (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else

chromium-64.0.3282.134.tar.xz -> chromium-69.0.3497.100.tar.xz Changed