- update to 124.0.6367.91

- fixed bz#2277228 - chromium wrapper causes library issues (symbol lookup error) - use system dav1d - drop patches which are needed for bundled libdav1d.
8 months ago · f09d3f6cf3
parent 007d8d62a1
commit f09d3f6cf3
8 changed files with 16 additions and 10691 deletions
--- a/0001-Add-PPC64-support-for-libdav1d.patch
+++ b/0001-Add-PPC64-support-for-libdav1d.patch
@ -1,23 +0,0 @@
-From 61dcf0ff9603e8f5b0a859fb0837c51527ebae43 Mon Sep 17 00:00:00 2001
-From: Colin Samples <colin.samples+git@gmail.com>
-Date: Fri, 1 Nov 2019 11:50:52 -0400
-Subject: [PATCH] Add PPC64 support for libdav1d
-
---
- third_party/dav1d/BUILD.gn            | 21 ++++++++++++++++++++
- third_party/dav1d/generate_configs.py | 28 ++-------------------------
- third_party/dav1d/generate_source.py  |  2 ++
- 3 files changed, 25 insertions(+), 26 deletions(-)
-
-Index: chromium-120.0.6099.71/third_party/dav1d/generate_configs.py
-===================================================================
--- chromium-120.0.6099.71.orig/third_party/dav1d/generate_configs.py
-+++ chromium-120.0.6099.71/third_party/dav1d/generate_configs.py
-@@ -203,6 +203,7 @@ def main():
-     linux_env = os.environ
-     linux_env['CC'] = 'clang'
- 
-+    GenerateConfig('config/linux/ppc64', linux_env)
-     GenerateConfig('config/linux/x64', linux_env)
- 
-     noasm_dir = 'config/linux-noasm/x64'
--- a/0001-Fix-libdav1d-compilation-on-clang-ppc.patch
+++ b/0001-Fix-libdav1d-compilation-on-clang-ppc.patch
@ -1,33 +0,0 @@
-From e14024659e0fc2af3df6ec56ce39a8e93b75722d Mon Sep 17 00:00:00 2001
-From: Colin Samples <colin.samples+git@gmail.com>
-Date: Sun, 8 Dec 2019 19:25:02 -0500
-Subject: [PATCH] Fix libdav1d compilation on clang ppc
-
---
- src/ppc/dav1d_types.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-Index: chromium-120.0.6099.71/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
-===================================================================
--- chromium-120.0.6099.71.orig/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
-+++ chromium-120.0.6099.71/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
-@@ -51,4 +51,19 @@
- #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
- #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
- 
-+#if defined(__clang__)
-+#undef vec_splats
-+#define vec_splats(N)                     \
-+    _Generic((N),                         \
-+        unsigned char:      ((u8x16)(N)), \
-+        signed char:        ((i8x16)(N)), \
-+        unsigned short:     ((u16x8)(N)), \
-+        signed short:       ((i16x8)(N)), \
-+        unsigned int:       ((u32x4)(N)), \
-+        signed int:         ((i32x4)(N)), \
-+        unsigned long long: ((u64x2)(N)), \
-+        signed long long:   ((i64x2)(N))  \
-+    )
-+#endif
-+
- #endif /* DAV1D_SRC_PPC_TYPES_H */
--- a/0003-third_party-ffmpeg-Add-ppc64-generated-config.patch
+++ b/0003-third_party-ffmpeg-Add-ppc64-generated-config.patch
--- a/0003-third_party-libvpx-Add-ppc64-vsx-files.patch
+++ b/0003-third_party-libvpx-Add-ppc64-vsx-files.patch
@ -1,35 +0,0 @@
--- a/third_party/libvpx/libvpx_srcs.gni
-+++ b/third_party/libvpx/libvpx_srcs.gni
-@@ -4302,6 +4302,7 @@
-   "//third_party/libvpx/source/libvpx/vp9/common/vp9_seg_common.c",
-   "//third_party/libvpx/source/libvpx/vp9/common/vp9_thread_common.c",
-   "//third_party/libvpx/source/libvpx/vp9/common/vp9_tile_common.c",
-+  "//third_party/libvpx/source/libvpx/vp9/common/ppc/vp9_idct_vsx.c",
-   "//third_party/libvpx/source/libvpx/vp9/decoder/vp9_decodeframe.c",
-   "//third_party/libvpx/source/libvpx/vp9/decoder/vp9_decodemv.c",
-   "//third_party/libvpx/source/libvpx/vp9/decoder/vp9_decoder.c",
-@@ -4340,6 +4341,7 @@
-   "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_svc_layercontext.c",
-   "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_tokenize.c",
-   "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_treewriter.c",
-+  "//third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c",
-   "//third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c",
-   "//third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c",
-   "//third_party/libvpx/source/libvpx/vp9/vp9_iface_common.c",
-@@ -4368,6 +4370,16 @@
-   "//third_party/libvpx/source/libvpx/vpx_dsp/variance.c",
-   "//third_party/libvpx/source/libvpx/vpx_dsp/vpx_convolve.c",
-   "//third_party/libvpx/source/libvpx/vpx_dsp/vpx_dsp_rtcd.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/deblock_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/hadamard_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/intrapred_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/inv_txfm_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/sad_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/subtract_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/variance_vsx.c",
-+  "//third_party/libvpx/source/libvpx/vpx_dsp/ppc/vpx_convolve_vsx.c",
-   "//third_party/libvpx/source/libvpx/vpx_mem/vpx_mem.c",
-   "//third_party/libvpx/source/libvpx/vpx_ports/ppc_cpudetect.c",
-   "//third_party/libvpx/source/libvpx/vpx_scale/generic/gen_scalers.c",
--- a/0003-thirdparty-fix-dav1d-gn.patch
+++ b/0003-thirdparty-fix-dav1d-gn.patch
@ -1,43 +0,0 @@
-Index: chromium-120.0.6099.71/third_party/dav1d/config/linux/ppc64/config.h
-===================================================================
--- /dev/null
-+++ chromium-120.0.6099.71/third_party/dav1d/config/linux/ppc64/config.h
-@@ -0,0 +1,38 @@
-+/*
-+ * Autogenerated by the Meson build system.
-+ * Do not edit, your changes will be lost.
-+ */
-+
-+#pragma once
-+
-+#define ARCH_AARCH64 0
-+
-+#define ARCH_ARM 0
-+
-+#define ARCH_PPC64LE 1
-+
-+#define ARCH_X86 0
-+
-+#define ARCH_X86_32 0
-+
-+#define ARCH_X86_64 0
-+
-+#define CONFIG_16BPC 1
-+
-+#define CONFIG_8BPC 1
-+
-+// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
-+
-+#define ENDIANNESS_BIG 0
-+
-+#define HAVE_ASM 1
-+
-+#define HAVE_CLOCK_GETTIME 1
-+
-+#define HAVE_DLSYM 1
-+
-+#define HAVE_GETAUXVAL 1
-+
-+#define HAVE_POSIX_MEMALIGN 1
-+
-+#define HAVE_UNISTD_H 1
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@ -25,15 +25,6 @@ else
  [ -f "$xdg_app_dir/mimeapps.list" ] || touch "$xdg_app_dir/mimeapps.list"
 fi

-# Always use our versions of ffmpeg libs.
-# This also makes RPMs find the compatibly-named library symlinks.
-if [[ -n "$LD_LIBRARY_PATH" ]]; then
-  LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH"
-else
-  LD_LIBRARY_PATH="$HERE:$HERE/lib"
-fi
-export LD_LIBRARY_PATH
-
 export CHROME_VERSION_EXTRA="Built from source for @@BUILD_TARGET@@"

 # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
--- a/chromium.spec
+++ b/chromium.spec
@ -202,7 +202,6 @@
 %global bundlewoff2 1
 %global bundlelibaom 1
 %global bundlelibavif 1
-%global bundledav1d 1
 %global bundlesnappy 1

 # Fedora's Python 2 stack is being removed, we use the bundled Python libraries
@ -246,6 +245,7 @@
 %else
 %global bundlebrotli 1
 %endif
+%global bundledav1d 0
 %global bundleopus 0
 %global bundlelibusbx 0
 %global bundlelibwebp 0
@ -306,7 +306,7 @@
 %endif

 Name:	chromium%{chromium_channel}
-Version: 124.0.6367.78
+Version: 124.0.6367.91
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@ -528,8 +528,6 @@ Patch389: 0002-third_party-libvpx-Remove-bad-ppc64-config.patch
 Patch390: 0002-third-party-boringssl-add-generated-files.patch
 Patch391: 0003-third_party-libvpx-Add-ppc64-generated-config.patch
 # Enabling VSX causes artifacts to appear in VP9 videos
-Patch392: 0003-third_party-libvpx-Add-ppc64-vsx-files.patch
-Patch393: 0003-third_party-ffmpeg-Add-ppc64-generated-config.patch
 Patch394: 0004-third_party-libvpx-work-around-ambiguous-vsx.patch

 # Enable VSX acceleration in Skia.  Requires POWER8 or higher.
@ -545,10 +543,7 @@ Patch402: fix-partition-alloc-compile.patch
 Patch403: 0002-Add-ppc64-trap-instructions.patch
 Patch404: 0001-Fix-highway-ppc-hwcap.patch

-Patch405: 0001-Add-PPC64-support-for-libdav1d.patch
-Patch406: 0001-Fix-libdav1d-compilation-on-clang-ppc.patch
 Patch407: fix-ppc64-linux-syscalls-headers.patch
-Patch408: 0003-thirdparty-fix-dav1d-gn.patch
 Patch409: use-sysconf-page-size-on-ppc64.patch

 Patch410: dawn-fix-typos.patch
@ -1217,6 +1212,7 @@ udev.
 %patch -P315 -p1 -b .assignment-expressions
 %ifarch aarch64
 %patch -P305 -p1 -b .memory_tagging
+%patch -P317 -p1 -b .libdav1d-aarch64
 %endif
 %endif

@ -1224,7 +1220,6 @@ udev.
 %patch -P307 -p1 -R -b .v8-c++20
 %patch -P308 -p1 -R -b .v8-c++20
 %patch -P314 -p1 -b .clang16-buildflag
-%patch -P317 -p1 -b .libdav1d-aarch64
 %endif

 %patch -P310 -p1 -b .missing-header-files
@ -1306,10 +1301,10 @@ udev.
 %patch -P403 -p1 -b .0002-Add-ppc64-trap-instructions
 %patch -P404 -p1 -b .0001-Fix-highway-ppc-hwcap

-%patch -P405 -p1 -b .0001-Add-PPC64-support-for-libdav1d
-%patch -P406 -p1 -b .0001-Fix-libdav1d-compilation-on-clang-ppc
+#patch -P405 -p1 -b .0001-Add-PPC64-support-for-libdav1d
+#patch -P406 -p1 -b .0001-Fix-libdav1d-compilation-on-clang-ppc
 %patch -P407 -p1 -b .fix-ppc64-linux-syscalls-headers
-%patch -P408 -p1 -b .0003-thirdparty-fix-dav1d-gn
+#patch -P408 -p1 -b .0003-thirdparty-fix-dav1d-gn
 %patch -P409 -p1 -b .use-sysconf-page-size-on-ppc64

 %patch -P410 -p1 -b .dawn-fix-typos
@ -1389,6 +1384,10 @@ sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/d
 # bz#2265957, add correct platform
 sed -i "s/Linux x86_64/Linux %{_arch}/" content/common/user_agent.cc
 
+%if ! %{bundledav1d}
+cp -a third_party/dav1d/version/version.h third_party/dav1d/libdav1d/include/dav1d/
+%endif
+
 %build
 # utf8 issue on epel7, Internal parsing error 'ascii' codec can't
 # decode byte 0xe2 in position 474: ordinal not in range(128)
@ -2121,6 +2120,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif

 %changelog
+* Sat Apr 27 2024 Than Ngo <than@redhat.com> - 124.0.6367.91-1
+- update to 124.0.6367.91
+- fixed bz#2277228 - chromium wrapper causes library issues (symbol lookup error)
+- use system dav1d
+
 * Wed Apr 24 2024 Than Ngo <than@redhat.com> - 124.0.6367.78-1
 - update to 124.0.6367.78
  * Critical CVE-2024-4058: Type Confusion in ANGLE
--- a/2
+++ b/2
@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea
 SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
-SHA512 (chromium-124.0.6367.78-clean.tar.xz) = ae6985050f511c495d8dff8137cf40feb2df85e30a502ead1327a6b70837d165ac4235318cc55839253c3b62059be73aa75c75105e809e5500c947126b14fcc2
+SHA512 (chromium-124.0.6367.91-clean.tar.xz) = 183a3af2b639e63bec636e9ad9e6d091993cb63bb4369b9804b8a72d8fb946e6efd9288884bd9698426b0f595cc57ff4e9884ff91fba7ec1ed16d9d96eb046d1