forked from pool/nodejs-electron
Bruno Pitrus
f9784f9258
- Update to 31.6.0 * ABI break: NODE_MODULE_VERSION is now 125 * Chromium 126.0.6478.234 * Node 20.17.0 * V8 12.6 * Breaking change: Remove WebSQL support * Breaking change: nativeImage.toDataURL will preserve PNG colorspace * Added options parameter to Session.clearData API. * Extended webContents.setWindowOpenHandler to support manual creation of BrowserWindow. * clearData method added to Session * Extended WebContentsView to accept pre-existing webContents object. * see https://www.electronjs.org/blog/electron-31-0 and https://github.com/electron/electron/releases/tag/v31.0.0 for more - Drop no longer needed patches * electron-13-fix-use-thin-lto.patch * remove-openscreen.patch * system-yuv.patch * chromium-122-abseil-shims.patch * electron-16-std-vector-non-const.patch * fake_ssl_socket_client-Wlto-type-mismatch.patch * angle-FramebufferVk-powf.patch * span_reader-missing-optional.patch * bitset-missing-uint8_t-memcpy.patch * temporal_scalability_id_extractor-missing-bitset.patch * gpu_adapter_info-missing-optional.patch * first_party_sets_handler_database_helper-missing-optional.patch * async_iterable-forwarding.patch * script_streamer-atomic-include.patch - Add patches to fix build * fix-build-without-safebrowsing.patch * fix-build-without-supervised-users.patch * Cr126-abseil-shims.patch * absl-base-dynamic_annotations.patch * webp-no-sharpyuv.patch * http_auth_ntlm_mechanism-could-not-convert-to-base-span.patch * angle-State-constexpr.patch * color_provider-incomplete-ColorProviderInternal.patch * run_segmenter-missing-optional.patch * page_popup_controller-missing-optional.patch * native_css_paint_definition-expected-unqualified-id.patch * text_decoder-missing-optional.patch * real_time_reporting_bindings-forward-declaration.patch * blink-platform-INSIDE_BLINK-Wodr.patch * quiche-QuicIntervalDeque-no-match-for-operator-mm.patch * ConsumeRadii-linker-error.patch - Conditionally revert upstreamed ffmpeg-7-ffmpeg_video_decoder-reordered_opaque.patch on old ffmpeg - Revert upstream changes to build with system abseil (quiche-absl-HexStringToBytes.patch) - Refresh bad-font-gc patches from Debian - aarch64: disable LTO also on Fedora 39 due to OOM OBS-URL: https://build.opensuse.org/request/show/1201463 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=171
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(
|
|
side_data + side_data_size);
|
|
}
|
|
|
|
+#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));
|