forked from pool/nodejs-electron
Bruno Pitrus
267719b9ea
- New upstream release 27.0.1
* Updated Chromium to 118.0.5993.89.
* Fixed an issue where calling loadURL during some webContents url loading events could crash.
* Fixed an issue where fully occluded windows would return an empty image from webContents.capturePage()
* Fixed some redundant permission dialogs while screen sharing on Wayland.
- Fix typo installing icon file to wrong folder.
- Update to 27.0.0:
* ABI break: NODE_MODULE_VERSION is now 118
* Chromium 118.0.5993.32
* Node 18.17.1
* V8 11.8
* The deprecated color scheme changed events in systemPreferences have been removed.
* The systemPreferences.getAppLevelAppearance, systemPreferences.setAppLevelAppearance and systemPreferences.appLevelAppearance APIs have been removed,
as well as the alternate-selected-control-text value for systemPreferences.getColor.
* see https://www.electronjs.org/blog/electron-27-0 and https://www.electronjs.org/blog/electron-26-0 for new features
- Drop upstreamed patches
* absl-uint128-do-not-assume-abi.patch
* cpu-missing-uint8_t.patch
* electron-24-components-missing-headers.patch
* mojom-python3.12-imp.patch
* re2-11-StringPiece.patch
* swiftshader-llvm17.patch
- (Fedora) switch to bundled avif as Chromium no longer builds with avif 0.x
* drop avif_image_decoder-AVIF_PIXEL_FORMAT_COUNT.patch
* drop avif_image_decoder-libavif-1-mode.patch
* drop avif_image_decoder-repetitionCount-clli.patch
- Drop no longer relevant chromium-86-fix-vaapi-on-intel.patch
- (Leap and Fedora) reverse upstream changes to build with re2 10
* replace-StringPiece-with-string_view.patch
- (Fedora <39) reverse upstream changes to build with icu 71
* v8-icu73-alt_calendar.patch
* v8-icu73-simple-case-folding.patch
- Reverse upstream changes to build against old brotli
* brotli-remove-shared-dictionary.patch
- Add patches to fix build errors
* absl-make_unique-missing-include.patch
* autofill_i18n_parsing_expressions-constexpr.patch
* chromium-117-blink-BUILD-mnemonic.patch
* decoder_buffer_side_data-missing-uint8_t.patch
* disable-tests.patch
* keyboard_util-gcc12-invalid-constexpr.patch
* kwallet_dbus-missing-uint8_t.patch
* material_color_utilities-tones-missing-round.patch
* page_content_annotations_common-remove-tflite.patch
* partition_root-attribute.patch
* perfetto-numeric_storage-double_t.patch
* sensor_reading-missing-int64_t-size_t.patch
* simple_font_data-freetype-include.patch
* utf_string_conversion_utils-missing-numeric_limits.patch
OBS-URL: https://build.opensuse.org/request/show/1119084
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=103
68 lines
2.7 KiB
Diff
68 lines
2.7 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(
|
|
// TODO(crbug.com/1471504): This is now broken without side data; remove.
|
|
buffer = DecoderBuffer::CopyFrom(packet->data, packet->size);
|
|
} else {
|
|
+#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));
|