From 1e2f91b9238ecc26a85a9ee2fa375929b238bcbe Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Fri, 19 Aug 2022 09:57:47 -0400 Subject: [PATCH] 104.0.5112.101 --- chromium-104-ContentRendererClient-type.patch | 28 +++++++ ...01-enable-hardware-accelerated-mjpeg.patch | 36 ++++----- ...0.5112.101-system-minizip-header-fix.patch | 76 +++++++++++++++++++ chromium.spec | 27 ++++--- clean_ffmpeg.sh | 3 + sources | 2 +- 6 files changed, 143 insertions(+), 29 deletions(-) create mode 100644 chromium-104-ContentRendererClient-type.patch rename chromium-102.0.5005.61-enable-hardware-accelerated-mjpeg.patch => chromium-104.0.5112.101-enable-hardware-accelerated-mjpeg.patch (51%) create mode 100644 chromium-104.0.5112.101-system-minizip-header-fix.patch diff --git a/chromium-104-ContentRendererClient-type.patch b/chromium-104-ContentRendererClient-type.patch new file mode 100644 index 00000000..a6d5a86f --- /dev/null +++ b/chromium-104-ContentRendererClient-type.patch @@ -0,0 +1,28 @@ +From a61a70605f9efc81fead5bf6984bc5ce39f1569d Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 27 May 2022 18:11:52 +0000 +Subject: [PATCH] libstdc++: fix incomplete type of + content::ContentRendererClient + +Destructor of std::unique_ptr in libstdc++ uses sizeof() which +requires full definition of media::AudioEncoder for return type of +cast_streaming::ResourceProvider. +--- + content/public/renderer/content_renderer_client.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc +index 63456aa..637a2a7 100644 +--- a/content/public/renderer/content_renderer_client.cc ++++ b/content/public/renderer/content_renderer_client.cc +@@ -6,6 +6,7 @@ + + #include "base/command_line.h" + #include "build/build_config.h" ++#include "components/cast_streaming/renderer/public/resource_provider.h" + #include "content/public/common/content_switches.h" + #include "media/base/demuxer.h" + #include "media/base/renderer_factory.h" +-- +2.35.1 + diff --git a/chromium-102.0.5005.61-enable-hardware-accelerated-mjpeg.patch b/chromium-104.0.5112.101-enable-hardware-accelerated-mjpeg.patch similarity index 51% rename from chromium-102.0.5005.61-enable-hardware-accelerated-mjpeg.patch rename to chromium-104.0.5112.101-enable-hardware-accelerated-mjpeg.patch index 68732726..06116e4d 100644 --- a/chromium-102.0.5005.61-enable-hardware-accelerated-mjpeg.patch +++ b/chromium-104.0.5112.101-enable-hardware-accelerated-mjpeg.patch @@ -1,7 +1,7 @@ -diff -up chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/about_flags.cc ---- chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg 2022-05-19 02:16:44.000000000 +0000 -+++ chromium-102.0.5005.61/chrome/browser/about_flags.cc 2022-06-03 20:09:42.298053196 +0000 -@@ -4308,12 +4308,12 @@ const FeatureEntry kFeatureEntries[] = { +diff -up chromium-104.0.5112.101/chrome/browser/about_flags.cc.accel-mjpeg chromium-104.0.5112.101/chrome/browser/about_flags.cc +--- chromium-104.0.5112.101/chrome/browser/about_flags.cc.accel-mjpeg 2022-08-16 23:29:08.000000000 +0000 ++++ chromium-104.0.5112.101/chrome/browser/about_flags.cc 2022-08-18 14:21:36.762266571 +0000 +@@ -4485,12 +4485,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -17,10 +17,10 @@ diff -up chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg chromi {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, -diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc ---- chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-06-03 17:55:53.493268667 +0000 -+++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc 2022-06-03 20:22:41.162906775 +0000 -@@ -4029,7 +4029,7 @@ const char kUseAngleGL[] = "OpenGL"; +diff -up chromium-104.0.5112.101/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-104.0.5112.101/chrome/browser/flag_descriptions.cc +--- chromium-104.0.5112.101/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-08-16 23:29:09.000000000 +0000 ++++ chromium-104.0.5112.101/chrome/browser/flag_descriptions.cc 2022-08-18 14:25:23.609572649 +0000 +@@ -4170,7 +4170,7 @@ const char kUseAngleGL[] = "OpenGL"; // ChromeOS ------------------------------------------------------------------- @@ -29,7 +29,7 @@ diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; -@@ -4037,6 +4037,10 @@ const char kAcceleratedMjpegDecodeDescri +@@ -4178,6 +4178,10 @@ const char kAcceleratedMjpegDecodeDescri "Enable hardware-accelerated mjpeg decode for captured frame where " "available."; @@ -37,13 +37,13 @@ diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg + +#if BUILDFLAG(IS_CHROMEOS_ASH) + - const char kAllowDisableTouchpadHapticFeedbackName[] = - "Allow disabling touchpad haptic feedback"; - const char kAllowDisableTouchpadHapticFeedbackDescription[] = -diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.h ---- chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-06-03 17:55:53.494268633 +0000 -+++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.h 2022-06-03 20:23:50.514578649 +0000 -@@ -2303,11 +2303,15 @@ extern const char kUseAngleGL[]; + const char kAdaptiveChargingForTestingName[] = + "Show adaptive charging notifications for testing"; + const char kAdaptiveChargingForTestingDescription[] = +diff -up chromium-104.0.5112.101/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-104.0.5112.101/chrome/browser/flag_descriptions.h +--- chromium-104.0.5112.101/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-08-18 14:21:36.765266469 +0000 ++++ chromium-104.0.5112.101/chrome/browser/flag_descriptions.h 2022-08-18 14:26:10.469983301 +0000 +@@ -2390,11 +2390,15 @@ extern const char kUseAngleGL[]; // ChromeOS ------------------------------------------------------------------- @@ -57,6 +57,6 @@ diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg c + +#if BUILDFLAG(IS_CHROMEOS_ASH) + - extern const char kAllowDisableTouchpadHapticFeedbackName[]; - extern const char kAllowDisableTouchpadHapticFeedbackDescription[]; + extern const char kAdaptiveChargingName[]; + extern const char kAdaptiveChargingDescription[]; diff --git a/chromium-104.0.5112.101-system-minizip-header-fix.patch b/chromium-104.0.5112.101-system-minizip-header-fix.patch new file mode 100644 index 00000000..acda4361 --- /dev/null +++ b/chromium-104.0.5112.101-system-minizip-header-fix.patch @@ -0,0 +1,76 @@ +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip 2022-08-18 23:16:03.451728329 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc 2022-08-18 23:16:23.966049114 +0000 +@@ -21,8 +21,8 @@ limitations under the License. + #include "absl/status/status.h" // from @com_google_absl + #include "absl/strings/str_format.h" // from @com_google_absl + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" +-#include "contrib/minizip/unzip.h" ++#include ++#include + #include "flatbuffers/flatbuffers.h" // from @flatbuffers + #include "tensorflow/lite/schema/schema_generated.h" + #include "tensorflow_lite_support/cc/common.h" +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip 2022-08-18 23:16:52.463105585 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc 2022-08-18 23:17:12.849430606 +0000 +@@ -19,8 +19,8 @@ limitations under the License. + #include + #include + +-#include "contrib/minizip/ioapi.h" +-#include "contrib/minizip/zip.h" ++#include ++#include + #include "flatbuffers/flatbuffers.h" // from @flatbuffers + #include "tensorflow/lite/schema/schema_generated.h" + #include "tensorflow_lite_support/cc/common.h" +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip 2022-08-18 23:18:14.697382850 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc 2022-08-18 23:18:27.148970583 +0000 +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" ++#include + + namespace tflite { + namespace metadata { +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h.system-minizip 2022-08-18 20:14:28.116854693 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h 2022-08-18 20:14:28.115854726 +0000 +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" ++#include + + namespace tflite { + namespace metadata { +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip 2022-08-18 23:19:14.807392634 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc 2022-08-18 23:19:31.177850617 +0000 +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" ++#include + + namespace tflite { + namespace metadata { +diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h +--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip 2022-08-18 20:14:28.116854693 +0000 ++++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h 2022-08-18 20:14:28.116854693 +0000 +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" ++#include + + namespace tflite { + namespace metadata { diff --git a/chromium.spec b/chromium.spec index 11ca13d8..b0d4f7c5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -220,15 +220,15 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id %nil %endif -%global majorversion 103 +%global majorversion 104 %if %{freeworld} Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.5060.114 -Release: 2%{?dist} +Version: %{majorversion}.0.5112.101 +Release: 1%{?dist} %if %{?freeworld} %if %{?shared} # chromium-libs-media-freeworld @@ -286,10 +286,11 @@ Patch57: chromium-96.0.4664.45-missing-cstring.patch Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-103-VirtualCursor-std-layout.patch Patch59: chromium-103-VirtualCursor-std-layout.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-103-SubstringSetMatcher-packed.patch -Patch60: chromium-103-SubstringSetMatcher-packed.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-103-FrameLoadRequest-type.patch -Patch61: chromium-103-FrameLoadRequest-type.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-104-ContentRendererClient-type.patch +Patch60: chromium-104-ContentRendererClient-type.patch + +# Fix headers to look for system paths when we are using system minizip +Patch61: chromium-104.0.5112.101-system-minizip-header-fix.patch # https://github.com/v8/v8/commit/2ed27bba6a881a152887f3ab1008e989fce617e3 Patch63: chromium-102.0.5005.115-v8-aarch64-gcc-cfi-fix.patch @@ -380,7 +381,7 @@ Patch111: chromium-99.0.4844.51-el7-extra-operator==.patch # VAAPI # Upstream turned VAAPI on in Linux in 86 -Patch202: chromium-102.0.5005.61-enable-hardware-accelerated-mjpeg.patch +Patch202: chromium-104.0.5112.101-enable-hardware-accelerated-mjpeg.patch Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch @@ -1024,8 +1025,11 @@ udev. %patch57 -p1 -b .missing-cstring %patch58 -p1 -b .ffmpeg-deprecations %patch59 -p1 -b .VirtualCursor-std-layout -%patch60 -p1 -b .SubstringSetMatcher-packed -%patch61 -p1 -b .FrameLoadRequest-type +%patch60 -p1 -b .ContentRendererType-client + +%if ! 0%{?bundleminizip} +%patch61 -p1 -b .system-minizip +%endif %patch63 -p1 -b .gcc-cfi-fix %patch64 -p1 -b .aarch64-cxxflags-addition @@ -2185,6 +2189,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Thu Aug 18 2022 Tom Callaway - 104.0.5112.101-1 +- update to 104.0.5112.101 + * Wed Jul 20 2022 Fedora Release Engineering - 103.0.5060.114-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 614c0fe4..d9989834 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -68,6 +68,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/aac_ac3_parser.h \ libavcodec/aac_defines.h \ libavcodec/ac3.h \ + libavcodec/ac3defs.h \ libavcodec/ac3tab.h \ libavcodec/adts_header.h \ libavcodec/avcodec.h \ @@ -261,6 +262,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavformat/options.c \ libavformat/pcm.c \ libavformat/utils.c \ + libavformat/version.c \ libavutil/aarch64/asm.S \ libavutil/aarch64/bswap.h \ libavutil/aarch64/cpu.c \ @@ -273,6 +275,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavutil/tx_float.c \ libavutil/tx_template.c \ libavutil/utils.c \ + libavutil/version.c \ libavutil/x86/cpu.c \ libavutil/x86/float_dsp_init.c \ libavutil/x86/x86inc.asm \ diff --git a/sources b/sources index 1affc181..0a9637d8 100644 --- a/sources +++ b/sources @@ -21,4 +21,4 @@ SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1d SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a SHA512 (node-v12.22.6-linux-arm64.tar.xz) = 87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d SHA512 (node-v12.22.6-linux-x64.tar.xz) = e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176 -SHA512 (chromium-103.0.5060.114-clean.tar.xz) = 9173f2110c6442043b057bfdb629874a1dba92a392d368dc23b66d4926567d7c71a341150499768e3536bf154d64cfc54d99f37d2cc232e38bfa1498cc06a32c +SHA512 (chromium-104.0.5112.101-clean.tar.xz) = 280c88c3b8a14acae8187835ffddfad3f76f6b53fd9a33e39a7c980f29d898250647f922242a41cbb9fdac7c54b2f4e181a9520adc9b7f1b40aac4e0b57be9a0