forked from pool/nodejs-electron
Dominique Leuenberger
612fa607f8
- Update to version 17.1.2 * https://github.com/electron/electron/releases/tag/v17.1.2 * https://github.com/electron/electron/releases/tag/v17.1.1 * https://github.com/electron/electron/releases/tag/v17.1.0 * Added electron-17-breakpad-align-int-types.patch * Added chromium-98-compiler.patch * Added chromium-98-MiraclePtr-gcc-ice.patch * Added chromium-98-WaylandFrameManager-check.patch * Added chromium-98-EnumTable-crash.patch * Added chromium-ffmpeg-first-dts.patch * Added system-libdrm.patch * Removed chromium-94-ffmpeg-roll.patch * Removed chromium-95-compiler.patch * Removed chromium-96-CommandLine-include.patch * Removed chromium-96-DrmRenderNodePathFinder-include.patch * Removed chromium-96-RestrictedCookieManager-tuple.patch * Removed electron-16-node-fix-python3.10-import.patch - Fix building with gcc-12 * Added electron-16-fix-swiftshader-template.patch * Added electron-16-v8-missing-utility-include.patch - Fix building on Fedora 36 and newer - Updated ffmpeg patches OBS-URL: https://build.opensuse.org/request/show/962506 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nodejs-electron?expand=0&rev=20
69 lines
3.0 KiB
Diff
69 lines
3.0 KiB
Diff
Index: chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
|
|
===================================================================
|
|
--- chromium-98.0.4758.80.orig/build/linux/unbundle/libdrm.gn
|
|
+++ chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
|
|
@@ -11,7 +11,10 @@ pkg_config("system_libdrm") {
|
|
|
|
shim_headers("libdrm_shim") {
|
|
root_path = "src/include"
|
|
- headers = [ "drm.h" ]
|
|
+ headers = [
|
|
+ "drm.h",
|
|
+ "drm_fourcc.h",
|
|
+ ]
|
|
}
|
|
|
|
source_set("libdrm") {
|
|
Index: chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline.cc
|
|
===================================================================
|
|
--- chromium-98.0.4758.80.orig/media/gpu/chromeos/video_decoder_pipeline.cc
|
|
+++ chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline.cc
|
|
@@ -28,7 +28,7 @@
|
|
|
|
#if BUILDFLAG(USE_VAAPI)
|
|
#include "media/gpu/vaapi/vaapi_video_decoder.h"
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
+#include <drm_fourcc.h>
|
|
#elif BUILDFLAG(USE_V4L2_CODEC)
|
|
#include "media/gpu/v4l2/v4l2_video_decoder.h"
|
|
#else
|
|
Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
|
|
===================================================================
|
|
--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/crtc_controller.h
|
|
+++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
|
|
@@ -11,7 +11,7 @@
|
|
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/trace_event/traced_value.h"
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
+#include <drm_fourcc.h>
|
|
#include "ui/gfx/swap_result.h"
|
|
#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
|
|
#include "ui/ozone/platform/drm/gpu/drm_overlay_plane.h"
|
|
Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
|
|
===================================================================
|
|
--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
|
|
+++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
|
|
@@ -20,7 +20,7 @@
|
|
#include "base/trace_event/trace_conversion_helper.h"
|
|
#include "base/trace_event/trace_event.h"
|
|
#include "base/trace_event/traced_value.h"
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
+#include <drm_fourcc.h>
|
|
#include "third_party/skia/include/core/SkCanvas.h"
|
|
#include "third_party/skia/include/core/SkImage.h"
|
|
#include "ui/gfx/geometry/point.h"
|
|
Index: chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
|
|
===================================================================
|
|
--- chromium-98.0.4758.80.orig/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
|
|
+++ chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
|
|
@@ -23,7 +23,7 @@
|
|
#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
+#include <drm_fourcc.h>
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
// gn check does not account for BUILDFLAG(), so including this header will
|