Update to 117.0.5938.88-1

3 files changed, 84 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6427f04c6f49..e7674b902663 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-no-extras
 	pkgdesc = Chromium without hangout services, widevine, or chromedriver
-	pkgver = 117.0.5938.62
+	pkgver = 117.0.5938.88
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	arch = x86_64
@@ -46,6 +46,7 @@ pkgbase = chromium-no-extras
 	depends = opus
 	depends = harfbuzz
 	depends = re2
+	depends = libavif
 	depends = jsoncpp
 	depends = libxslt
 	depends = libpng
@@ -55,20 +56,22 @@ pkgbase = chromium-no-extras
 	optdepends = qt5-base: enable Qt5 with --enable-features=AllowQt
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
-	provides = chromium=117.0.5938.62
+	provides = chromium=117.0.5938.88
 	conflicts = chromium
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.62.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.88.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
 	source = https://github.com/stha09/chromium-patches/releases/download/chromium-116-patchset-2/chromium-116-patchset-2.tar.xz
 	source = add-memory-for-std-unique_ptr-in-third_party-ip.patch
+	source = roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
 	source = REVERT-disable-autoupgrading-debug-info.patch
 	source = material-color-utilities-cmath.patch
 	source = use-oauth2-client-switches-as-default.patch
-	sha256sums = 8b8c697208ef9fe014de112c62ebd19268cd6cd9430838700afa985c715175d7
+	sha256sums = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0
 	sha256sums = 7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9
+	sha256sums = 30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6
 	sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
 	sha256sums = 55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
diff --git a/PKGBUILD b/PKGBUILD
index 55d643556797..0d323d300838 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=chromium
 pkgname=chromium-no-extras
-pkgver=117.0.5938.62
+pkgver=117.0.5938.88
 pkgrel=1
 _launcher_ver=8
 _gcc_patchset=116-patchset-2
@@ -32,13 +32,15 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
         https://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz
         add-memory-for-std-unique_ptr-in-third_party-ip.patch
+        roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
         REVERT-disable-autoupgrading-debug-info.patch
         material-color-utilities-cmath.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('8b8c697208ef9fe014de112c62ebd19268cd6cd9430838700afa985c715175d7'
+sha256sums=('4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0'
             '7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9'
+            '30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6'
             '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
             '55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@@ -60,8 +62,8 @@ declare -gA _system_libs=(
   [harfbuzz-ng]=harfbuzz
   [icu]=icu
   [jsoncpp]=jsoncpp
-  #[libaom]=aom      # https://aomedia.googlesource.com/aom/+/706ee36dcc82
-  #[libavif]=libavif # https://github.com/AOMediaCodec/libavif/commit/4d2776a3
+  #[libaom]=aom
+  [libavif]=libavif
   [libdrm]=
   [libjpeg]=libjpeg
   [libpng]=libpng
@@ -120,6 +122,7 @@ prepare() {
 
   # Upstream fixes
   patch -Np1 -i ../add-memory-for-std-unique_ptr-in-third_party-ip.patch
+  patch -Np1 -i ../roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
 
   # Revert addition of compiler flag that needs newer clang
   patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch
diff --git a/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch b/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
new file mode 100644
index 000000000000..ba821a90502d
--- /dev/null
+++ b/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
@@ -0,0 +1,70 @@
+From 21d7cf44b1cd83bb0d847515e28ca550404b0033 Mon Sep 17 00:00:00 2001
+From: Wan-Teh Chang <wtc@google.com>
+Date: Tue, 22 Aug 2023 19:39:04 +0000
+Subject: [PATCH] Roll src/third_party/libavif/src/ b33d9ebfc..676aded35 (3
+ commits)
+
+https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git/+log/b33d9ebfc961..676aded3501f
+
+$ git log b33d9ebfc..676aded35 --date=short --no-merges --format='%ad %ae %s'
+2023-08-22 wtc Change imir.mode back to imir.axis
+2023-08-22 wtc Don't use Identity matrix coefficients with 4:0:0
+2023-08-21 yguyon Increase test values in avifstreamtest
+
+Created with:
+  roll-dep src/third_party/libavif/src
+R=dalecurtis@chromium.org,jzern@google.com
+
+Note that imir.mode is renamed imir.axis.
+
+Change-Id: Ie13972640969f123b7e4580f36d6d6bab913c0f8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4803347
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Wan-Teh Chang <wtc@google.com>
+Cr-Commit-Position: refs/heads/main@{#1186746}
+---
+ .../image-decoders/avif/avif_image_decoder.cc      | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
+index deb3e66d66f..c9f1b185417 100644
+--- a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
++++ b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
+@@ -1005,22 +1005,22 @@ bool AVIFImageDecoder::UpdateDemuxer() {
+     angle = container->irot.angle;
+     CHECK_LT(angle, 4);
+   }
+-  // |mode| specifies how the mirroring is performed.
++  // |axis| specifies how the mirroring is performed.
+   //   -1: No mirroring.
+   //    0: The top and bottom parts of the image are exchanged.
+   //    1: The left and right parts of the image are exchanged.
+-  int mode = -1;
++  int axis = -1;
+   if (container->transformFlags & AVIF_TRANSFORM_IMIR) {
+-    mode = container->imir.mode;
+-    CHECK_LT(mode, 2);
++    axis = container->imir.axis;
++    CHECK_LT(axis, 2);
+   }
+   // MIAF Section 7.3.6.7 (Clean aperture, rotation and mirror) says:
+   //   These properties, if used, shall be indicated to be applied in the
+   //   following order: clean aperture first, then rotation, then mirror.
+   //
+-  // In the kModeAngleToOrientation array, the first dimension is mode (with an
++  // In the kAxisAngleToOrientation array, the first dimension is axis (with an
+   // offset of 1). The second dimension is angle.
+-  constexpr ImageOrientationEnum kModeAngleToOrientation[3][4] = {
++  constexpr ImageOrientationEnum kAxisAngleToOrientation[3][4] = {
+       // No mirroring.
+       {ImageOrientationEnum::kOriginTopLeft,
+        ImageOrientationEnum::kOriginLeftBottom,
+@@ -1037,7 +1037,7 @@ bool AVIFImageDecoder::UpdateDemuxer() {
+        ImageOrientationEnum::kOriginBottomLeft,
+        ImageOrientationEnum::kOriginLeftTop},
+   };
+-  orientation_ = kModeAngleToOrientation[mode + 1][angle];
++  orientation_ = kAxisAngleToOrientation[axis + 1][angle];
+ 
+   // Determine whether the image can be decoded to YUV.
+   // * Alpha channel is not supported.