forked from pool/nodejs-electron
Bruno Pitrus
d2352147a4
- Update to version 28.2.4:
* ABI break: NODE_MODULE_VERSION is now 119
* Chromium 120.0.6099.291
* Node 18.18.2
* V8 12.0
* The ipcRenderer.sendTo() method has been removed.
* The scroll-touch-{begin,end,edge} events have been removed.
* Setting backgroundThrottling to false will disable frames throttling in the BrowserWindow for all WebContents displayed by it.
* Enabled ESM support.
* The UtilityProcess API now supports ESM entrypoints.
* Added several properties to the display object including detected, maximumCursorSize, and nativeOrigin.
* Added support for ELECTRON_OZONE_PLATFORM_HINT environment variable on Linux.
* see https://www.electronjs.org/blog/electron-28-0 and https://github.com/electron/electron/releases/tag/v28.0.0 for more
- Drop upstreamed patches:
* absl-make_unique-missing-include.patch
* async_shared_storage_database_impl-missing-absl-WrapUnique.patch
* autofill_i18n_parsing_expressions-constexpr.patch
* chromium-system-libusb.patch
* computed_style_base-nbsp.patch
* CVE-2023-38552-node-integrity-checks-according-to-policies.patch
* CVE-2023-39333-node-create_dynamic_module-code-injection.patch
* CVE-2023-45143-undici-cookie-leakage.patch
* decoder_buffer_side_data-missing-uint8_t.patch
* electron_api_app-GetPathConstant-non-constexpr.patch
* electron_browser_context-missing-variant.patch
* flatbuffers.gn
* libsecret.gn
* highway.gn
* kwallet_dbus-missing-uint8_t.patch
* mojo_ukm_recorder-missing-WrapUnique.patch
* page_content_annotations_common-remove-tflite.patch
* Partial-migration-from-imp-to-importlib.patch
* partition_root-attribute.patch
* quiche-missing-absl-includes.patch
* replace_gn_files-system-libs.patch
* sensor_reading-missing-int64_t-size_t.patch
* services-network-optional-explicit-constructor.patch
* simple_font_data-freetype-include.patch
* utf_string_conversion_utils-missing-numeric_limits.patch
* vulkan_memory_allocator.gn
* vulkan_memory_allocator-upgrade.patch
* vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch
- Add patches to fix build errors:
* atspi.patch
* local_frame-local_frame_client-incomplete-WebBackgroundResourceFetchAssets.patch
* v8-instance-type-inl-constexpr-used-before-its-definition.patch
- Adjust brotli-remove-shared-dictionary.patch to disable the offending code which is now live,
and enable this patch only on systems with old brotli.
- Conditionally add pending_task_safety_flag-abseil-2022-nullability.patch
to make electron buildable with old abseil.
- Use bundled avif everywhereas chromium now uses features available only in development snapshots.
OBS-URL: https://build.opensuse.org/request/show/1152479
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=126
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
From: 52c3e9c0f140a8742034e107fb0f371c0d73bf1d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Sun, 12 Sep 2021 04:20:11 +0200
|
|
Subject: [PATCH] chromium-93: fix building with system-ffmpeg
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The version of ffmpeg bundled in Chromium changed ABI a little, which
|
|
affected the code in that the type of the last parameter of
|
|
av_packet_get_side_data() is now size_t instead of int.
|
|
|
|
This causes Chromium to fail to build with system-ffmpeg if the system
|
|
ffmpeg's version does not yet have this ABI change.
|
|
|
|
Fix the code to be able to compile with older ffmpeg as well.
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
media/filters/audio_decoder_unittest.cc | 4 ++++
|
|
media/filters/ffmpeg_demuxer.cc | 16 ++++++++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
Index: electron-17.1.2/media/filters/audio_decoder_unittest.cc
|
|
===================================================================
|
|
--- electron-17.1.2.orig/media/filters/audio_decoder_unittest.cc 2022-03-11 08:49:30.740949416 +0100
|
|
+++ electron-17.1.2/media/filters/audio_decoder_unittest.cc 2022-03-11 09:17:36.916088893 +0100
|
|
@@ -102,7 +102,11 @@ void SetDiscardPadding(AVPacket* packet,
|
|
}
|
|
|
|
// If the timestamp is positive, try to use FFmpeg's discard data.
|
|
+#if LIBAVUTIL_VERSION_MAJOR < 57
|
|
+ int skip_samples_size = 0;
|
|
+#else
|
|
size_t skip_samples_size = 0;
|
|
+#endif
|
|
const uint32_t* skip_samples_ptr =
|
|
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
|
|
packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
|
|
Index: chromium-118.0.5993.18/media/filters/ffmpeg_demuxer.cc
|
|
===================================================================
|
|
--- chromium-118.0.5993.18.orig/media/filters/ffmpeg_demuxer.cc
|
|
+++ chromium-118.0.5993.18/media/filters/ffmpeg_demuxer.cc
|
|
@@ -398,7 +398,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
|
|
|
|
scoped_refptr<DecoderBuffer> buffer;
|
|
|
|
+#if LIBAVUTIL_VERSION_MAJOR < 57
|
|
+ int side_data_size = 0;
|
|
+#else
|
|
size_t side_data_size = 0;
|
|
+#endif
|
|
uint8_t* side_data = av_packet_get_side_data(
|
|
packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
|
|
|
|
@@ -461,7 +465,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
|
|
packet->size - data_offset);
|
|
}
|
|
|
|
+#if LIBAVUTIL_VERSION_MAJOR < 57
|
|
+ int skip_samples_size = 0;
|
|
+#else
|
|
size_t skip_samples_size = 0;
|
|
+#endif
|
|
const uint32_t* skip_samples_ptr =
|
|
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
|
|
packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
|