forked from pool/nodejs-electron
* Chromium 134.0.6998.205 * Node 22.14.0 * V8 13.4 * Removed AVIF image format * Added excludeUrls to webRequest filter and deprecated the use of empty arrays in urls property. * Added fromVersionID on ServiceWorkers to get an instance of ServiceWorkerMain. * Deprecated getPreloads and setPreloads on Session. * Moved 'console-message' arguments into event object. * Added ServiceWorkerMain class to interact with service workers in the main process. * Added contextBridge.executeInMainWorld to safely execute code across world boundaries. * Added frame to 'console-message' event. * Added optional animation parameter to BrowserWindow.setVibrancy. * Added permission support for document.executeCommand("paste"). * Added support for service worker preload scripts. * Support Portal's globalShortcuts. Electron must be run with --enable-features=GlobalShortcutsPortal in order to have the feature working. * see https://github.com/electron/electron/releases/tag/v35.0.0 and https://www.electronjs.org/blog/electron-35-0 for more - Remove Fedora 40 support * drop bundled-minizip.patch * drop quiche-absl-HexStringToBytes.patch - Leap 15.6: use backported wayland-protocols * drop wayland-protocol-toplevel-icon.patch * drop wayland-protocol-toplevel-icon-2.patch * drop wayland-protocol-toplevel-drag.patch - Build with LTO also on 15.6 (so now we enable it everywhere) - Fedora: use system simdjson * merge system-ada-url.patch into use-system-libraries-in-node.patch - Drop no longer applicable patches * account_id-missing-optional.patch * blink-platform-INSIDE_BLINK-Wodr.patch * boringssl-internal-addc-cxx.patch * build-without-extensions.patch * css_attr_value_tainting-missing-once_flag.patch * electron-13-fix-base-check-nomerge.patch * exception_context-missing-variant.patch * fix-build-without-safebrowsing.patch * fix-build-without-service-discovery.patch * ip_protection_data_types-missing-optional.patch * node-compiler.patch * skia_image_decoder_base-missing-stack.patch * vtt_scanner-missing-variant.patch * wayland_connection-Wchanges-meaning.patch - Add backported or upstreamable patches * ax_platform_node_id-fpermissive.patch * browser_process_impl-fix-safe_browsing_mode-0.patch * content_browser_client-incomplete-WebUIController.patch * css_shape_value-constructor.patch * exception_state-constexpr-initializer.patch * fix-build-without-pdf.patch * fix-build-without-video-effects.patch * media_session_uma_helper-missing-optional.patch * object_paint_properties-explicit-specialization-in-non-namespace-scope.patch * perfetto-ThreadTrack-Current-null-dereference.patch * picture_in_picture_window_manager_uma_helper-missing-optional.patch * plugin_utils-build-without-electron_extensions.patch * raw_ptr-fpermissive.patch * resource_response-Wchanges-meaning.patch * resource-Wchanges-meaning.patch * string-hasher-flax-vector-conversions.patch * string_truncator-convert.patch * style_scope-unqualified-To.patch * to_vector-std-projected-gcc119888.patch * unexportable_key_service_impl-Wlto-type-mismatch.patch * xml_document_parser-Wmissing-template-keyword.patch - merge remove-libphonenumber.patch & delete-old-language-detection-which-uses-tflite.patch into remove-ai-language-detection-factory-which-requires-tflite-and-libphonenumber.patch - Revert upstream change which breaks build with old abseil * webrtc-make_ref_counted-absl2024-nullability.patch - Conditionally (15.6) remove feature change which needs new spirv * angle-SPV_BINARY_TO_TEXT_OPTION_NESTED_INDENT.patch - Use system sqlite in node (except 15.6) * system-sqlite.patch - Remove more rust code * chromium-132-no-rust.patch - Actually disable AVIF support without disabling AV1 video * disable-avif-really.patch - Various other build fixes * absl_strings-missing-headers.patch * blink-shape_result-highway.patch * build-without-mesage-center.patch * fix-system-highway.patch * gn-logspam-breaks-install.patch * permission-gcc14.2.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=202
60 lines
2.1 KiB
Diff
60 lines
2.1 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: chromium-126.0.6478.8/media/filters/ffmpeg_demuxer.cc
|
|
===================================================================
|
|
--- chromium-126.0.6478.8.orig/media/filters/ffmpeg_demuxer.cc
|
|
+++ chromium-126.0.6478.8/media/filters/ffmpeg_demuxer.cc
|
|
@@ -343,11 +343,19 @@
|
|
}
|
|
|
|
base::span<const uint8_t> GetSideData(const AVPacket* packet) {
|
|
+#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, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
|
|
|
|
+#if LIBAVUTIL_VERSION_MAJOR < 57
|
|
+ return base::span<const uint8_t>(side_data, base::checked_cast<size_t>(side_data_size));
|
|
+#else
|
|
return base::span<const uint8_t>(side_data, side_data_size);
|
|
+#endif
|
|
}
|
|
|
|
void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
|
|
@@ -474,7 +482,11 @@
|
|
base::HeapArray<uint8_t>::CopiedFrom(side_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.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
|