commit 0609bc2209ec1cff08f07900cac530c8bd00279b Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Mar 2 12:07:19 2022 +0000 Update to 99.0.4844.51 chromium-freeworld.spec | 25 ++++++++------- chromium-glibc-2.34-r1.patch | 20 ++++++++++++ chromium-names.patch | 2 +- chromium-rawhide-gcc-std-max-fix.patch | 24 -------------- sources | 4 +-- webcodecs-stop-using-AudioOpusEncoder.patch | 49 +++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 38 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index c0bf9f7..c56286b 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -27,15 +27,15 @@ %global system_re2 1 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 98.0.4758.102 -Release: 2%{?dist} +Version: 99.0.4844.51 +Release: 1%{?dist} Summary: Chromium built with all freeworld codecs and VA-API support License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi... # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-98-patchset-5 +%global patchset_revision chromium-99-patchset-3 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -152,8 +152,10 @@ ExclusiveArch: x86_64 aarch64 Patch201: chromium-98-EnumTable-crash.patch Patch202: chromium-InkDropHost-crash.patch Patch203: chromium-98-system-libdrm.patch +Patch1204: chromium-glibc-2.34-r1.patch # Arch Linux patches: +Patch220: webcodecs-stop-using-AudioOpusEncoder.patch Patch1226: chromium-93-ffmpeg-4.4.patch Patch1227: unbundle-ffmpeg-av_stream_get_first_dts.patch Patch1228: add-a-TODO-about-a-missing-pnacl-flag.patch @@ -169,7 +171,6 @@ Patch301: chromium-gcc11.patch Patch302: chromium-java-only-allowed-in-android-builds.patch Patch303: chromium-aarch64-cxxflags-addition.patch Patch304: chromium-clang-format.patch -Patch1303: chromium-rawhide-gcc-std-max-fix.patch # RPM Fusion patches [free/chromium-freeworld]: Patch401: chromium-fix-vaapi-on-intel.patch @@ -195,15 +196,17 @@ Patch1406: chromium-rpm-fusion-brand.patch %{__scm_apply_patch -p1} <%{patchset_root}/%{1} %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch -%patchset_apply chromium-95-libyuv-aarch64.patch -%patchset_apply chromium-98-MiraclePtr-gcc-ice.patch -%patchset_apply chromium-98-WaylandFrameManager-check.patch +%patchset_apply chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch # Apply patches up to #1000 from this spec. %autopatch -M1000 -p1 # Manually apply patches that need an ifdef +%if 0%{?fedora} >= 35 +%patch1204 -p1 +%endif + %if %{system_ffmpeg} %patch1226 -p1 %patch1227 -p1 @@ -214,10 +217,6 @@ Patch1406: chromium-rpm-fusion-brand.patch %patch1229 -Rp1 %endif -%if 0%{?fedora} >= 35 -%patch1303 -p1 -%endif - %patch1406 -p1 ./build/linux/unbundle/remove_bundled_libraries.py --do-remove \ @@ -289,6 +288,7 @@ Patch1406: chromium-rpm-fusion-brand.patch third_party/devscripts \ third_party/devtools-frontend \ third_party/devtools-frontend/src/front_end/third_party/acorn \ + third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json \ third_party/devtools-frontend/src/front_end/third_party/axe-core \ third_party/devtools-frontend/src/front_end/third_party/chromium \ third_party/devtools-frontend/src/front_end/third_party/codemirror \ @@ -737,6 +737,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/vk_swiftshader_icd.json #########################################changelogs################################################# %changelog +* Wed Mar 02 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 99.0.4844.51-1 +- Update to 99.0.4844.51 + * Sat Feb 19 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 98.0.4758.102-2 - Use compat-ffmpeg4 for f36+ diff --git a/chromium-glibc-2.34-r1.patch b/chromium-glibc-2.34-r1.patch new file mode 100644 index 0000000..0747b4f --- /dev/null +++ b/chromium-glibc-2.34-r1.patch @@ -0,0 +1,20 @@ +--- a/sandbox/linux/services/credentials.cc ++++ b/sandbox/linux/services/credentials.cc +@@ -11,6 +11,7 @@ + #include <stddef.h> + #include <stdint.h> + #include <stdio.h> ++#include <string.h> + #include <sys/syscall.h> + #include <sys/types.h> + #include <sys/wait.h> +@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() { + // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f. + clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; + +- char tls_buf[PTHREAD_STACK_MIN] = {0}; ++ char tls_buf[PTHREAD_STACK_MIN]; ++ memset(tls_buf, 0, PTHREAD_STACK_MIN); + tls = tls_buf; + #endif + diff --git a/chromium-names.patch b/chromium-names.patch index 1d24b10..2f141c4 100644 --- a/chromium-names.patch +++ b/chromium-names.patch @@ -50,7 +50,7 @@ Replace hard-coded "chromium-browser" with package name. + return RPM_FUSION_PACKAGE_NAME ".desktop"; #endif } - #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -294,6 +294,8 @@ source_set("audio") { diff --git a/sources b/sources index 44b55e1..1ba090c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-98.0.4758.102.tar.xz) = 7bcbeb8c8701b77e6143a811667dbc00d6b36a16b2256ced66d7ad49dafdb1f9fede61811e4ddd2aff478bda604aad5ce675261c2cb5f16722ff6d55bdf803a4 -SHA512 (chromium-patches-chromium-98-patchset-5.tar.gz) = 9da2ea41698b2bcab5b143d5aa733a46e8d9aaa83217a0b9f9a4d8528ba1ef05381b43b38fcbd9d5befa1f9df200827b0fd6cea408babe6b42b36320f133eb62 +SHA512 (chromium-99.0.4844.51.tar.xz) = 85f81afa35907d59e7dee328c1c30d61a4106b8d5e9dabad4888c0a1962d8e4debfb88358417123979d8a4ad471acbf8d90c0a3bb2cc9bac5fef71b800bcc1af +SHA512 (chromium-patches-chromium-99-patchset-3.tar.gz) = 8dcd3acb256f32b1af0c0ef3eea61061c1d857f8887f2990ec170bc87a3f49a9a8b15dfe50ac05e3eedabea33e88365f91094550237b5500ffa7f66734523b76 diff --git a/webcodecs-stop-using-AudioOpusEncoder.patch b/webcodecs-stop-using-AudioOpusEncoder.patch new file mode 100644 index 0000000..32957d3 --- /dev/null +++ b/webcodecs-stop-using-AudioOpusEncoder.patch @@ -0,0 +1,49 @@ +From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 +From: Eugene Zemtsov <eugene(a)chromium.org&gt; +Date: Thu, 24 Feb 2022 23:17:20 +0000 +Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo + audio encoder + +AudioOpusEncoder was only used here for testing. Let's not let it get +comfortable. We'll use MF AAC encoder here when we have it. (Soon...) + +Bug: 1259883 +Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 +Commit-Queue: Eugene Zemtsov <eugene(a)chromium.org&gt; +Auto-Submit: Eugene Zemtsov <eugene(a)chromium.org&gt; +Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org&gt; +Commit-Queue: Dale Curtis <dalecurtis(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/main@{#974895} +--- + media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc +index 8f83a4d6cf6..40cdaff8d3a 100644 +--- a/media/mojo/services/gpu_mojo_media_client.cc ++++ b/media/mojo/services/gpu_mojo_media_client.cc +@@ -13,7 +13,6 @@ + #include "build/chromeos_buildflags.h" + #include "gpu/ipc/service/gpu_channel.h" + #include "media/audio/audio_features.h" +-#include "media/audio/audio_opus_encoder.h" + #include "media/base/audio_decoder.h" + #include "media/base/cdm_factory.h" + #include "media/base/media_switches.h" +@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder( + scoped_refptr<base::SequencedTaskRunner> task_runner) { + if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) + return nullptr; +- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on +- // we'll create a real platform encoder here. +- auto opus_encoder = std::make_unique<AudioOpusEncoder>(); +- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( +- {base::TaskPriority::USER_BLOCKING}); +- return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder), +- std::move(encoding_runner), +- std::move(task_runner)); ++ return nullptr; + } + + VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {