Update to 89.0.4381.6

4 files changed, 44 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d357a1da3c22..00384947d088 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-dev
 	pkgdesc = The open-source project behind Google Chrome (Dev Channel)
-	pkgver = 89.0.4356.6
+	pkgver = 89.0.4381.6
 	pkgrel = 1
 	url = http://www.chromium.org
 	install = chromium-dev.install
@@ -8,10 +8,10 @@ pkgbase = chromium-dev
 	license = BSD
 	makedepends = gperf
 	makedepends = ninja
-	makedepends = python2-protobuf
-	makedepends = python2-setuptools
-	makedepends = python2-xcb-proto
+	makedepends = python-protobuf
+	makedepends = python-setuptools
 	makedepends = python
+	makedepends = python2
 	makedepends = yasm
 	makedepends = nasm
 	makedepends = git
@@ -38,14 +38,14 @@ pkgbase = chromium-dev
 	optdepends = kwalletmanager: Needed for storing passwords in KWallet5
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = ttf-font: For some typography
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4356.6.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4381.6.tar.xz
 	source = git+https://github.com/foutrelis/chromium-launcher.git
 	source = chromium-dev.svg
-	source = chromium-skia-harmony-r2.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/fbcff5bbd7b98dfba37fced2496fb9a04d46a385/trunk/chromium-skia-harmony.patch
-	sha256sums = d98a7602b2aaa23a9f4f5411d51c1efdeab204dd03679082f8f380afd4e200cb
+	source = fix_hevc_in_non_cromeos.patch
+	sha256sums = 514065f14b69034884ea1b5277f90481997bcc33e3c077c1f0c9b2e230113c0c
 	sha256sums = SKIP
 	sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
-	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
+	sha256sums = 814246e08b63884dae096fe317f837259294118b5336e8da081b19eeb7991977
 
 pkgname = chromium-dev
 	options = !strip
diff --git a/.gitignore b/.gitignore
index a7fad0ffc104..b5ab7355f826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 !PKGBUILD
 !chromium-dev.install
 !chromium-dev.svg
-!chromium-skia-harmony-r1.patch
+!fix_hevc_in_non_cromeos.patch
diff --git a/PKGBUILD b/PKGBUILD
index d16fbf82c73b..73717d7206ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _use_wayland=0           # Build Wayland NOTE: extremely experimental and don't
 ## -- Package and components information -- ##
 ##############################################
 pkgname=chromium-dev
-pkgver=89.0.4356.6
+pkgver=89.0.4381.6
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
 arch=('x86_64')
@@ -52,10 +52,10 @@ fi
 makedepends=(
              'gperf'
              'ninja'
-             'python2-protobuf'
-             'python2-setuptools'
-             'python2-xcb-proto'
+             'python-protobuf'
+             'python-setuptools'
              'python'
+             'python2' # for Nacl
              'yasm'
              'nasm'
              'git'
@@ -80,9 +80,9 @@ source=(
         # Patch form Gentoo.
 
         # Misc Patches.
+        'fix_hevc_in_non_cromeos.patch'
 
         # Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
-        'chromium-skia-harmony-r2.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/fbcff5bbd7b98dfba37fced2496fb9a04d46a385/trunk/chromium-skia-harmony.patch'
         )
 sha256sums=(
             #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
@@ -92,9 +92,8 @@ sha256sums=(
             # Patch form Gentoo
 
             # Misc Patches
-
+            '814246e08b63884dae096fe317f837259294118b5336e8da081b19eeb7991977'
             # Patch from crbug (chromium bugtracker) or Arch chromium package
-            '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
             )
 install=chromium-dev.install
 
@@ -141,13 +140,6 @@ _keeplibs=(
            'third_party/angle/src/third_party/libXNVCtrl'
            'third_party/angle/src/third_party/trace_event'
            'third_party/angle/src/third_party/volk'
-           'third_party/angle/third_party/glslang'
-           'third_party/angle/third_party/spirv-headers'
-           'third_party/angle/third_party/spirv-tools'
-           'third_party/angle/third_party/vulkan-headers'
-           'third_party/angle/third_party/vulkan-loader'
-           'third_party/angle/third_party/vulkan-tools'
-           'third_party/angle/third_party/vulkan-validation-layers'
            'third_party/apple_apsl'
            'third_party/axe-core'
            'third_party/blink'
@@ -204,7 +196,6 @@ _keeplibs=(
            'third_party/ffmpeg'
            'third_party/flatbuffers'
            'third_party/fusejs'
-           'third_party/glslang'
            'third_party/google_input_tools'
            'third_party/google_input_tools/third_party/closure_library'
            'third_party/google_input_tools/third_party/closure_library/third_party/closure'
@@ -291,24 +282,20 @@ _keeplibs=(
            'third_party/skia/include/third_party/skcms'
            'third_party/skia/include/third_party/vulkan'
            'third_party/skia/third_party/skcms'
-           'third_party/skia/third_party/vulkan'
            'third_party/smhasher'
-           'third_party/spirv-cross/spirv-cross'
-           'third_party/spirv-headers'
-           'third_party/SPIRV-Tools'
            'third_party/sqlite'
            'third_party/swiftshader'
            'third_party/swiftshader/third_party/astc-encoder'
            'third_party/swiftshader/third_party/llvm-subzero'
            'third_party/swiftshader/third_party/marl'
            'third_party/swiftshader/third_party/subzero'
-           'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1'
            'third_party/tcmalloc'
            'third_party/tint'
            'third_party/ukey2'
            'third_party/unrar'
            'third_party/usrsctp'
-           'third_party/vulkan'
+           'third_party/vulkan-deps'
+           'third_party/vulkan_memory_allocator'
            'third_party/wayland'
            'third_party/web-animations-js'
            'third_party/webdriver'
@@ -466,14 +453,13 @@ prepare() {
 
   # Force script incompatible with Python 3 to use /usr/bin/python2.
    sed -e '1s|python$|&2|' \
-     -i third_party/ffmpeg/chromium/scripts/build_ffmpeg.py \
      -i third_party/ffmpeg/chromium/scripts/generate_gn.py \
      -i third_party/dom_distiller_js/protoc_plugins/json_values_converter.py \
      -i third_party/dom_distiller_js/protoc_plugins/json_values_converter_tests.py
 
   # Py3toniced.
-  sed 's|iteritems|items|g' \
-    -i build/linux/unbundle/remove_bundled_libraries.py
+  2to3 -w --no-diff build/linux/unbundle/remove_bundled_libraries.py
+  2to3 -w --no-diff third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
 
   # Remove most bundled libraries. Some are still needed.
   msg2 "Removing unnecessary components to save disk space."
@@ -537,14 +523,14 @@ prepare() {
       -i third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
       -i third_party/libxml/chromium/libxml_utils.cc
 
+  # Fix build if enable HEVC in non-chromeOS system
+  patch -p1 -i "${srcdir}/fix_hevc_in_non_cromeos.patch"
+
   # # Patch from Gentoo
 
 
   # # Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
 
-  # https://crbug.com/skia/6663#c10.
-  patch -p0 -i "${srcdir}/chromium-skia-harmony-r2.patch"
-
   # Setup nodejs dependency.
   mkdir -p third_party/node/linux/node-linux-x64/bin/
   ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
@@ -559,7 +545,10 @@ prepare() {
 
   # Setup bundled ffmpeg.
   # Add build verbose output.
-  sed "s|'make', '-j|'make', 'V=1', '-j|g" -i third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+  # setup all cores
+  sed -e "s|'make', '-j|'make', 'V=1', '-j|g" \
+      -e "s|parallel_jobs = 8|parallel_jobs = $(nproc)|g" \
+      -i third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
   # Use system opus.
   rm -fr third_party/opus/src/include
   ln -sf /usr/include/opus/ third_party/opus/src/include
@@ -596,9 +585,8 @@ build() {
   chromium/scripts/generate_gn.py
   popd &> /dev/null
 
-
   msg2 "Starting building Chromium..."
-  LC_ALL=C buildtools/linux64/gn gen out/Release -v --args="${_flags[*]}" --script-executable=/usr/bin/python2
+  LC_ALL=C buildtools/linux64/gn gen out/Release -v --args="${_flags[*]}" --script-executable=/usr/bin/python
 
   # Build all.
   LC_ALL=C ninja -C out/Release -v chrome chrome_sandbox chromedriver
diff --git a/fix_hevc_in_non_cromeos.patch b/fix_hevc_in_non_cromeos.patch
new file mode 100644
index 000000000000..3e5071d5f4eb
--- /dev/null
+++ b/fix_hevc_in_non_cromeos.patch
@@ -0,0 +1,17 @@
+diff --git a/chrome/renderer/media/chrome_key_systems.cc.orig b/chrome/renderer/media/chrome_key_systems.cc
+index 2160697..c9de40c 100644
+--- a/chrome/renderer/media/chrome_key_systems.cc.orig
++++ b/chrome/renderer/media/chrome_key_systems.cc
+@@ -182,8 +182,12 @@ static SupportedCodecs GetSupportedCodecs(
+ #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+ #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+       case media::VideoCodec::kCodecHEVC:
++#if BUILDFLAG(IS_CHROMEOS_ASH)
+         if (is_secure && base::FeatureList::IsEnabled(
+                              chromeos::features::kCdmFactoryDaemon)) {
++#else
++        if (is_secure) {
++#endif
+           supported_codecs |= media::EME_CODEC_HEVC_PROFILE_MAIN;
+           supported_codecs |= media::EME_CODEC_HEVC_PROFILE_MAIN10;
+         }