2022-03-18 15:41:41 +00:00
|
|
|
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/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 @@
|
|
|
|
|
|
2023-09-13 04:57:45 +00:00
|
|
|
#include "base/memory/raw_ref.h"
|
2022-03-18 15:41:41 +00:00
|
|
|
#include "base/memory/weak_ptr.h"
|
|
|
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
|
|
|
+#include <drm_fourcc.h>
|
2023-01-18 06:07:26 +00:00
|
|
|
#include "third_party/perfetto/include/perfetto/tracing/traced_value_forward.h"
|
2022-03-18 15:41:41 +00:00
|
|
|
#include "ui/gfx/swap_result.h"
|
|
|
|
|
#include "ui/ozone/platform/drm/common/scoped_drm_types.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 @@
|
2023-09-13 04:57:45 +00:00
|
|
|
#include "base/metrics/histogram_macros.h"
|
2023-01-18 06:07:26 +00:00
|
|
|
#include "base/ranges/algorithm.h"
|
|
|
|
|
#include "base/trace_event/typed_macros.h"
|
2022-03-18 15:41:41 +00:00
|
|
|
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
|
|
|
|
+#include <drm_fourcc.h>
|
2023-01-18 06:07:26 +00:00
|
|
|
#include "third_party/perfetto/include/perfetto/tracing/traced_value.h"
|
2022-03-18 15:41:41 +00:00
|
|
|
#include "third_party/skia/include/core/SkCanvas.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkImage.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 @@
|
2023-09-13 04:57:45 +00:00
|
|
|
#include "media/gpu/chromeos/dmabuf_video_frame_pool.h"
|
2022-03-18 15:41:41 +00:00
|
|
|
#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
|
