File system-libdrm.patch of Package chromium-ffmpeg-extra (Revision b4936792cf8416871967ba43a0c2a86e)

Currently displaying revision b4936792cf8416871967ba43a0c2a86e , Show latest

56
 
1
Index: chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
2
===================================================================
3
--- chromium-98.0.4758.80.orig/build/linux/unbundle/libdrm.gn
4
+++ chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
5
@@ -11,7 +11,10 @@ pkg_config("system_libdrm") {
6
 
7
 shim_headers("libdrm_shim") {
8
   root_path = "src/include"
9
-  headers = [ "drm.h" ]
10
+  headers = [
11
+    "drm.h",
12
+    "drm_fourcc.h",
13
+  ]
14
 }
15
 
16
 source_set("libdrm") {
17
Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
18
===================================================================
19
--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/crtc_controller.h
20
+++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
21
@@ -11,7 +11,7 @@
22
 
23
 #include "base/memory/weak_ptr.h"
24
 #include "base/trace_event/traced_value.h"
25
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
26
+#include <drm_fourcc.h>
27
 #include "ui/gfx/swap_result.h"
28
 #include "ui/ozone/platform/drm/common/scoped_drm_types.h"
29
 #include "ui/ozone/platform/drm/gpu/drm_overlay_plane.h"
30
Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
31
===================================================================
32
--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
33
+++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
34
@@ -20,7 +20,7 @@
35
 #include "base/trace_event/trace_conversion_helper.h"
36
 #include "base/trace_event/trace_event.h"
37
 #include "base/trace_event/traced_value.h"
38
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
39
+#include <drm_fourcc.h>
40
 #include "third_party/skia/include/core/SkCanvas.h"
41
 #include "third_party/skia/include/core/SkImage.h"
42
 #include "ui/gfx/geometry/point.h"
43
Index: chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
44
===================================================================
45
--- chromium-98.0.4758.80.orig/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
46
+++ chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
47
@@ -23,7 +23,7 @@
48
 #include "media/gpu/chromeos/mailbox_video_frame_converter.h"
49
 #include "testing/gmock/include/gmock/gmock.h"
50
 #include "testing/gtest/include/gtest/gtest.h"
51
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
52
+#include <drm_fourcc.h>
53
 
54
 #if BUILDFLAG(IS_CHROMEOS_ASH)
55
 // gn check does not account for BUILDFLAG(), so including this header will
56