From 09a0287d67998b67648b9115537333c603640fe1 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 7 Apr 2022 19:50:11 -0400 Subject: [PATCH] 100.0.4896.75 --- ...-100-GLImplementationParts-constexpr.patch | 92 +++++++++++ chromium-100-InMilliseconds-constexpr.patch | 97 ++++++++++++ chromium-100-SCTHashdanceMetadata-move.patch | 35 +++++ chromium-100-macro-typo.patch | 29 ++++ ....60-missing-utility-for-std-exchange.patch | 12 ++ ...0.0.4896.60-widevine-other-locations.patch | 20 +++ ...4896.75-remoting-extra-qualification.patch | 147 ++++++++++++++++++ chromium.spec | 40 +++-- clean_ffmpeg.sh | 5 + sources | 24 --- 10 files changed, 463 insertions(+), 38 deletions(-) create mode 100644 chromium-100-GLImplementationParts-constexpr.patch create mode 100644 chromium-100-InMilliseconds-constexpr.patch create mode 100644 chromium-100-SCTHashdanceMetadata-move.patch create mode 100644 chromium-100-macro-typo.patch create mode 100644 chromium-100.0.4896.60-missing-utility-for-std-exchange.patch create mode 100644 chromium-100.0.4896.60-widevine-other-locations.patch create mode 100644 chromium-100.0.4896.75-remoting-extra-qualification.patch delete mode 100644 sources diff --git a/chromium-100-GLImplementationParts-constexpr.patch b/chromium-100-GLImplementationParts-constexpr.patch new file mode 100644 index 00000000..437e6729 --- /dev/null +++ b/chromium-100-GLImplementationParts-constexpr.patch @@ -0,0 +1,92 @@ +From d32156fd3773330eca99e9cba5e18db57aaa1a53 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sat, 19 Feb 2022 10:14:24 +0000 +Subject: [PATCH] GCC: make GLImplementationParts constructors constexpr + +Fix build error in GCC, as the constexpr operator== requires its +invocations to be also constexpr. +--- + ui/gl/gl_implementation.cc | 23 ----------------------- + ui/gl/gl_implementation.h | 25 +++++++++++++++++++++++-- + 2 files changed, 23 insertions(+), 25 deletions(-) + +diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc +index e4e5456..3e4a47c 100644 +--- a/ui/gl/gl_implementation.cc ++++ b/ui/gl/gl_implementation.cc +@@ -26,29 +26,6 @@ + + namespace gl { + +-ANGLEImplementation MakeANGLEImplementation( +- const GLImplementation gl_impl, +- const ANGLEImplementation angle_impl) { +- if (gl_impl == kGLImplementationEGLANGLE) { +- if (angle_impl == ANGLEImplementation::kNone) { +- return ANGLEImplementation::kDefault; +- } else { +- return angle_impl; +- } +- } else { +- return ANGLEImplementation::kNone; +- } +-} +- +-GLImplementationParts::GLImplementationParts( +- const ANGLEImplementation angle_impl) +- : gl(kGLImplementationEGLANGLE), +- angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} +- +-GLImplementationParts::GLImplementationParts(const GLImplementation gl_impl) +- : gl(gl_impl), +- angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {} +- + bool GLImplementationParts::IsValid() const { + if (angle == ANGLEImplementation::kNone) { + return (gl != kGLImplementationEGLANGLE); +diff --git a/ui/gl/gl_implementation.h b/ui/gl/gl_implementation.h +index 376ed58..a2513ea 100644 +--- a/ui/gl/gl_implementation.h ++++ b/ui/gl/gl_implementation.h +@@ -59,8 +59,14 @@ enum class ANGLEImplementation { + }; + + struct GL_EXPORT GLImplementationParts { +- explicit GLImplementationParts(const ANGLEImplementation angle_impl); +- explicit GLImplementationParts(const GLImplementation gl_impl); ++ constexpr explicit GLImplementationParts(const ANGLEImplementation angle_impl) ++ : gl(kGLImplementationEGLANGLE), ++ angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} ++ ++ constexpr explicit GLImplementationParts(const GLImplementation gl_impl) ++ : gl(gl_impl), ++ angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) { ++ } + + GLImplementation gl = kGLImplementationNone; + ANGLEImplementation angle = ANGLEImplementation::kNone; +@@ -80,6 +86,21 @@ struct GL_EXPORT GLImplementationParts { + bool IsValid() const; + bool IsAllowed(const std::vector& allowed_impls) const; + std::string ToString() const; ++ ++ private: ++ constexpr ANGLEImplementation MakeANGLEImplementation( ++ const GLImplementation gl_impl, ++ const ANGLEImplementation angle_impl) { ++ if (gl_impl == kGLImplementationEGLANGLE) { ++ if (angle_impl == ANGLEImplementation::kNone) { ++ return ANGLEImplementation::kDefault; ++ } else { ++ return angle_impl; ++ } ++ } else { ++ return ANGLEImplementation::kNone; ++ } ++ } + }; + + struct GL_EXPORT GLWindowSystemBindingInfo { +-- +2.34.1 + diff --git a/chromium-100-InMilliseconds-constexpr.patch b/chromium-100-InMilliseconds-constexpr.patch new file mode 100644 index 00000000..cf4562a1 --- /dev/null +++ b/chromium-100-InMilliseconds-constexpr.patch @@ -0,0 +1,97 @@ +From da6e3f6071fdabeb96c0805626418414b4a4cea8 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 9 Feb 2022 17:56:21 +0000 +Subject: [PATCH] GCC: make base::InMilliseconds(F,RoundedUp) constexpr + +media::DecodeTimestamp uses it in several constexpr methods. +--- + base/time/time.cc | 24 ------------------------ + base/time/time.h | 30 +++++++++++++++++++++++++++--- + 2 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/base/time/time.cc b/base/time/time.cc +index 0de273e..e0acda2 100644 +--- a/base/time/time.cc ++++ b/base/time/time.cc +@@ -74,30 +74,6 @@ int TimeDelta::InDaysFloored() const { + : std::numeric_limits::max(); + } + +-double TimeDelta::InMillisecondsF() const { +- if (!is_inf()) +- return static_cast(delta_) / Time::kMicrosecondsPerMillisecond; +- return (delta_ < 0) ? -std::numeric_limits::infinity() +- : std::numeric_limits::infinity(); +-} +- +-int64_t TimeDelta::InMilliseconds() const { +- if (!is_inf()) +- return delta_ / Time::kMicrosecondsPerMillisecond; +- return (delta_ < 0) ? std::numeric_limits::min() +- : std::numeric_limits::max(); +-} +- +-int64_t TimeDelta::InMillisecondsRoundedUp() const { +- if (!is_inf()) { +- const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond; +- // Convert |result| from truncating to ceiling. +- return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1) +- : result; +- } +- return delta_; +-} +- + double TimeDelta::InMicrosecondsF() const { + if (!is_inf()) + return static_cast(delta_); +diff --git a/base/time/time.h b/base/time/time.h +index c027aab..fb1d78d 100644 +--- a/base/time/time.h ++++ b/base/time/time.h +@@ -216,9 +216,9 @@ class BASE_EXPORT TimeDelta { + constexpr int InMinutes() const; + constexpr double InSecondsF() const; + constexpr int64_t InSeconds() const; +- double InMillisecondsF() const; +- int64_t InMilliseconds() const; +- int64_t InMillisecondsRoundedUp() const; ++ constexpr double InMillisecondsF() const; ++ constexpr int64_t InMilliseconds() const; ++ constexpr int64_t InMillisecondsRoundedUp() const; + constexpr int64_t InMicroseconds() const { return delta_; } + double InMicrosecondsF() const; + constexpr int64_t InNanoseconds() const; +@@ -889,6 +889,30 @@ constexpr int64_t TimeDelta::InSeconds() const { + return is_inf() ? delta_ : (delta_ / Time::kMicrosecondsPerSecond); + } + ++constexpr double TimeDelta::InMillisecondsF() const { ++ if (!is_inf()) ++ return static_cast(delta_) / Time::kMicrosecondsPerMillisecond; ++ return (delta_ < 0) ? -std::numeric_limits::infinity() ++ : std::numeric_limits::infinity(); ++} ++ ++constexpr int64_t TimeDelta::InMilliseconds() const { ++ if (!is_inf()) ++ return delta_ / Time::kMicrosecondsPerMillisecond; ++ return (delta_ < 0) ? std::numeric_limits::min() ++ : std::numeric_limits::max(); ++} ++ ++constexpr int64_t TimeDelta::InMillisecondsRoundedUp() const { ++ if (!is_inf()) { ++ const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond; ++ // Convert |result| from truncating to ceiling. ++ return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1) ++ : result; ++ } ++ return delta_; ++} ++ + constexpr int64_t TimeDelta::InNanoseconds() const { + return base::ClampMul(delta_, Time::kNanosecondsPerMicrosecond); + } +-- +2.34.1 + diff --git a/chromium-100-SCTHashdanceMetadata-move.patch b/chromium-100-SCTHashdanceMetadata-move.patch new file mode 100644 index 00000000..90394290 --- /dev/null +++ b/chromium-100-SCTHashdanceMetadata-move.patch @@ -0,0 +1,35 @@ +From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Wed, 23 Feb 2022 12:18:57 +0100 +Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue + +GCC rejects to do Return Value Optimization in +SCTHashdanceMetadata::ToValue, because the copy constructor is +deleted, and in that scenario RVO is rejected in GCC: + ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’: + ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’ + 191 | return value; + | ^~~~~ + In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14, + from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5: + ../../base/values.h:254:3: note: declared here + 254 | Value(const Value&) = delete; + | ^~~~~ + +Bug: 819294 +Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166 +--- + +diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc +index a057e8e..365527b 100644 +--- a/services/network/sct_auditing/sct_auditing_reporter.cc ++++ b/services/network/sct_auditing/sct_auditing_reporter.cc +@@ -188,7 +188,7 @@ + kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id)))); + value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd)); + value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry)); +- return value; ++ return std::move(value); + } + + // static diff --git a/chromium-100-macro-typo.patch b/chromium-100-macro-typo.patch new file mode 100644 index 00000000..833f8692 --- /dev/null +++ b/chromium-100-macro-typo.patch @@ -0,0 +1,29 @@ +From 1183b14db8bd08d731ff3433c436887de00be3aa Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Fri, 18 Feb 2022 16:28:25 +0000 +Subject: [PATCH] Fix typo in non-clang GSL_OWNER macro + +GCC build fails because GSL_OWNER is not defined (GSL_OWNER_ was +the one actually declared). + +Bug: 819294 +Change-Id: I1c3d17cb1c08b9bc0e8a888452da9868c308ddb5 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3472080 +Reviewed-by: Daniel Cheng +Commit-Queue: Daniel Cheng +Cr-Commit-Position: refs/heads/main@{#972974} +--- + +diff --git a/base/compiler_specific.h b/base/compiler_specific.h +index eec5810..1ee8074 100644 +--- a/base/compiler_specific.h ++++ b/base/compiler_specific.h +@@ -386,7 +386,7 @@ + #define GSL_OWNER [[gsl::Owner]] + #define GSL_POINTER [[gsl::Pointer]] + #else +-#define GSL_OWNER_ ++#define GSL_OWNER + #define GSL_POINTER + #endif + diff --git a/chromium-100.0.4896.60-missing-utility-for-std-exchange.patch b/chromium-100.0.4896.60-missing-utility-for-std-exchange.patch new file mode 100644 index 00000000..0bcd6c09 --- /dev/null +++ b/chromium-100.0.4896.60-missing-utility-for-std-exchange.patch @@ -0,0 +1,12 @@ +diff -up chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h +--- chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange 2022-02-25 22:30:02.833745309 +0000 ++++ chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h 2022-02-25 22:30:02.832745344 +0000 +@@ -58,6 +58,8 @@ + #include "config.h" + #include "glog/logging.h" + ++#include ++ + #ifdef HAVE_SYMBOLIZE + + #include diff --git a/chromium-100.0.4896.60-widevine-other-locations.patch b/chromium-100.0.4896.60-widevine-other-locations.patch new file mode 100644 index 00000000..a123b271 --- /dev/null +++ b/chromium-100.0.4896.60-widevine-other-locations.patch @@ -0,0 +1,20 @@ +diff -up chromium-100.0.4896.60/chrome/common/chrome_paths.cc.widevine-other-locations chromium-100.0.4896.60/chrome/common/chrome_paths.cc +--- chromium-100.0.4896.60/chrome/common/chrome_paths.cc.widevine-other-locations 2022-04-02 15:48:56.944051789 +0000 ++++ chromium-100.0.4896.60/chrome/common/chrome_paths.cc 2022-04-02 15:52:34.825642103 +0000 +@@ -319,6 +319,16 @@ bool PathProvider(int key, base::FilePat + + #if BUILDFLAG(ENABLE_WIDEVINE) + case chrome::DIR_BUNDLED_WIDEVINE_CDM: ++ base::PathService::Get(base::DIR_HOME, &cur); ++ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so")); ++ if (base::PathExists(cur)) { ++ break; ++ } ++ // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so ++ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) { ++ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")); ++ break; ++ } + if (!GetComponentDirectory(&cur)) + return false; + cur = cur.AppendASCII(kWidevineCdmBaseDirectory); diff --git a/chromium-100.0.4896.75-remoting-extra-qualification.patch b/chromium-100.0.4896.75-remoting-extra-qualification.patch new file mode 100644 index 00000000..9d4b6250 --- /dev/null +++ b/chromium-100.0.4896.75-remoting-extra-qualification.patch @@ -0,0 +1,147 @@ +diff -up chromium-100.0.4896.75/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification chromium-100.0.4896.75/remoting/host/mojom/remoting_mojom_traits.h +--- chromium-100.0.4896.75/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification 2022-04-05 20:02:25.525814644 +0000 ++++ chromium-100.0.4896.75/remoting/host/mojom/remoting_mojom_traits.h 2022-04-07 13:35:28.490655471 +0000 +@@ -30,7 +30,7 @@ + namespace mojo { + + template <> +-class mojo::StructTraits { ++class StructTraits { + public: + static bool value(bool value) { return value; } + +@@ -41,7 +41,7 @@ class mojo::StructTraits +-class mojo::StructTraits { ++class StructTraits { + public: + static float value(float value) { return value; } + +@@ -52,7 +52,7 @@ class mojo::StructTraits +-class mojo::StructTraits { ++class StructTraits { + public: + static int32_t value(int32_t value) { return value; } + +@@ -64,7 +64,7 @@ class mojo::StructTraits +-class mojo::StructTraits { ++class StructTraits { + public: + static uint32_t value(uint32_t value) { return value; } + +@@ -76,7 +76,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static bool use_update_notifications( +@@ -101,7 +101,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static bool enable_curtaining( +@@ -161,7 +161,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static int32_t width(const ::webrtc::DesktopSize& size) { +@@ -177,7 +177,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static int32_t x(const ::webrtc::DesktopVector& vector) { return vector.x(); } +@@ -243,7 +243,7 @@ struct EnumTraits +-class mojo::StructTraits { + public: + static const std::string& mime_type( +@@ -261,7 +261,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static bool pressed(const ::remoting::protocol::KeyEvent& event) { +@@ -297,7 +297,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static absl::optional x( +@@ -386,7 +386,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static const ::webrtc::DesktopSize& dimensions( +@@ -404,7 +404,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static const std::string& text(const ::remoting::protocol::TextEvent& event) { +@@ -416,7 +416,7 @@ class mojo::StructTraits +-class mojo::StructTraits { + public: + static uint32_t id(const ::remoting::protocol::TouchEventPoint& event) { +@@ -493,7 +493,7 @@ struct EnumTraits +-class mojo::StructTraits { + public: + static ::remoting::protocol::TouchEvent::TouchEventType event_type( +@@ -553,7 +553,7 @@ struct EnumTraits +-class mojo::StructTraits { + public: + static ::remoting::protocol::TransportRoute::RouteType type( diff --git a/chromium.spec b/chromium.spec index 50fc05b5..7d8aa712 100644 --- a/chromium.spec +++ b/chromium.spec @@ -217,14 +217,14 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id %nil %endif -%global majorversion 99 +%global majorversion 100 %if %{freeworld} Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4844.84 +Version: %{majorversion}.0.4896.75 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -257,10 +257,8 @@ Patch6: chromium-95.0.4638.69-norar.patch # Use Gentoo's Widevine hack # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch Patch7: chromium-71.0.3578.98-widevine-r3.patch -# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law) -Patch9: chromium-94.0.4606.54-gcc9-drop-rsp-clobber.patch # Try to load widevine from other places -Patch10: chromium-92.0.4515.107-widevine-other-locations.patch +Patch10: chromium-100.0.4896.60-widevine-other-locations.patch # Tell bootstrap.py to always use the version of Python we specify %if 0%{?build_with_python3} Patch11: chromium-93.0.4577.63-py3-bootstrap.patch @@ -283,8 +281,14 @@ Patch57: chromium-96.0.4664.45-missing-cstring.patch # prepare for using system ffmpeg (clean) # http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch -Patch60: chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-100-GLImplementationParts-constexpr.patch +Patch60: chromium-100-GLImplementationParts-constexpr.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-100-InMilliseconds-constexpr.patch +Patch61: chromium-100-InMilliseconds-constexpr.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-100-macro-typo.patch +Patch62: chromium-100-macro-typo.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-100-SCTHashdanceMetadata-move.patch +Patch63: chromium-100-SCTHashdanceMetadata-move.patch # Extra CXXFLAGS for aarch64 Patch64: chromium-91.0.4472.77-aarch64-cxxflags-addition.patch # Fix issue where closure_compiler thinks java is only allowed in android builds @@ -320,13 +324,13 @@ Patch86: chromium-94.0.4606.81-clang-format.patch Patch87: chromium-99.0.4844.84-markdownsafe-soft_str.patch # Fix extra qualification error -Patch97: chromium-98.0.4758.80-remoting-extra-qualification.patch +Patch97: chromium-100.0.4896.75-remoting-extra-qualification.patch # From gentoo Patch98: chromium-94.0.4606.71-InkDropHost-crash.patch # Enable WebRTCPPipeWireCapturer by default Patch99: chromium-96.0.4664.110-enable-WebRTCPipeWireCapturer-byDefault.patch # Add include for std::exchange -Patch100: chromium-98.0.4758.80-missing-utility-for-std-exchange.patch +Patch100: chromium-100.0.4896.60-missing-utility-for-std-exchange.patch # Use lstdc++ on EPEL7 only @@ -977,7 +981,6 @@ udev. %patch5 -p1 -b .nozlibmangle %patch6 -p1 -b .nounrar %patch7 -p1 -b .widevine-hack -%patch9 -p1 -b .gcc9 %patch10 -p1 -b .widevine-other-locations %if 0%{?build_with_python3} %patch11 -p1 -b .py3 @@ -992,7 +995,10 @@ udev. %patch56 -p1 -b .missing-cstdint %patch57 -p1 -b .missing-cstring %patch58 -p1 -b .ffmpeg-deprecations -%patch60 -p1 -b .AutofillAssistantModelExecutor-NoDestructor +%patch60 -p1 -b .GLImplementationParts-constexpr +%patch61 -p1 -b .InMilliseconds-constexpr +%patch62 -p1 -b .macro-typo +%patch63 -p1 -b .SCTHashdanceMetadata-move %patch64 -p1 -b .aarch64-cxxflags-addition %patch65 -p1 -b .java-only-allowed %patch67 -p1 -b .remoting-cstring @@ -1463,7 +1469,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/swiftshader/third_party/marl' \ 'third_party/swiftshader/third_party/subzero' \ 'third_party/swiftshader/third_party/SPIRV-Headers' \ - 'third_party/tcmalloc' \ 'third_party/tensorflow-text' \ 'third_party/test_fonts' \ 'third_party/tflite' \ @@ -1841,7 +1846,7 @@ rm -rf %{buildroot} %if %{build_headless} pushd %{headlessbuilddir} - cp -a headless_lib.pak headless_shell %{buildroot}%{chromium_path} + cp -a headless_lib_data.pak headless_lib_strings.pak headless_shell %{buildroot}%{chromium_path} # Explicitly strip headless_shell binary strip %{buildroot}%{chromium_path}/headless_shell popd @@ -2005,7 +2010,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %files common %if %{build_headless} -%{chromium_path}/headless_lib.pak +%{chromium_path}/headless_lib_data.pak +%{chromium_path}/headless_lib_strings.pak %endif %if %{build_clear_key_cdm} %{chromium_path}/libclearkeycdm.so @@ -2141,6 +2147,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Tue Apr 25 2022 Tom Callaway - 100.0.4896.75-1 +- update to 100.0.4896.75 + +* Sat Apr 2 2022 Tom Callaway - 100.0.4896.60-1 +- update to 100.0.4896.60 + * Sun Mar 27 2022 Tom Callaway - 99.0.4844.84-1 - update to 99.0.4844.84 - package up libremoting_core.so* for chrome-remote-desktop diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 60a40b48..2055fdc5 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -56,6 +56,7 @@ fi generated_files_headers="$generated_files_headers ${generated_files//.asm/.h}" header_files=" libavcodec/x86/inline_asm.h \ + libavcodec/x86/hpeldsp.h \ libavcodec/x86/mathops.h \ libavcodec/x86/vp56_arith.h \ libavcodec/aarch64/vp8dsp.h \ @@ -218,6 +219,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavcodec/aarch64/neon.S \ libavcodec/aarch64/vorbisdsp_neon.S \ libavcodec/aarch64/vp8dsp_neon.S \ + libavcodec/x86/hpeldsp.asm \ libavcodec/x86/hpeldsp_rnd_template.c \ libavcodec/x86/mdct15.asm \ libavcodec/x86/mdct15_init.c \ @@ -225,6 +227,8 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavcodec/x86/videodsp.asm \ libavcodec/x86/videodsp_init.c \ libavcodec/x86/vorbisdsp_init.c \ + libavcodec/x86/vp3dsp.asm \ + libavcodec/x86/vp8dsp.asm \ libavcodec/autorename_libavcodec_mdct15.c \ libavcodec/bit_depth_template.c \ libavcodec/fft_template.c \ @@ -246,6 +250,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavcodec/vorbisdsp.c \ libavcodec/vp3dsp.c \ libavcodec/vp8dsp.c \ + libavformat/flacdec.c \ libavformat/options.c \ libavformat/pcm.c \ libavformat/utils.c \ diff --git a/sources b/sources deleted file mode 100644 index b28a43f8..00000000 --- a/sources +++ /dev/null @@ -1,24 +0,0 @@ -SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e -SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1 -SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193 -SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) = 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a -SHA512 (Arimo-BoldItalic.ttf) = cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4 -SHA512 (Arimo-Bold.ttf) = 2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41 -SHA512 (Arimo-Italic.ttf) = 56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5 -SHA512 (Arimo-Regular.ttf) = 05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f -SHA512 (Cousine-BoldItalic.ttf) = 2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918 -SHA512 (Cousine-Bold.ttf) = 1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab -SHA512 (Cousine-Italic.ttf) = ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700 -SHA512 (Cousine-Regular.ttf) = a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0 -SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd -SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4 -SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38 -SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f -SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd -SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 -SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708 -SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad -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-99.0.4844.84-clean.tar.xz) = a442a7ff140ebec0831cb9bbaff0488ef77bb32a765e810c0d911cdf9d65fd9ac3e6e588a16ed1341d812582740651da1d62cfa632e134fbfae6df4a0e9a4cf4