File _service:download_url:3848.patch of Package mutter

Overview Repositories Revisions Requests Users Attributes Meta

File _service:download_url:3848.patch of Package mutter (Revision 4f16610db6a964b0f7b81d74d7e80010)

Currently displaying revision 4f16610db6a964b0f7b81d74d7e80010 , Show latest

From a6d8cb15fcda79a687f00a7571291f90a4f16e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Thu, 27 Jun 2024 18:00:10 +0200
Subject: [PATCH] kms/plane: Add meta_ prefix to struct drm_plane_size_hint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes error compiling against libdrm which defines struct
drm_plane_size_hint:

../src/backends/native/meta-kms-plane.c:67:8: error: redefinition of ‘struct drm_plane_size_hint’
   67 | struct drm_plane_size_hint {
      |        ^~~~~~~~~~~~~~~~~~~
In file included from /usr/local/include/libdrm/drm.h:1025,
                 from /usr/local/include/xf86drm.h:40,
                 from ../src/backends/native/meta-kms-plane-private.h:20,
                 from ../src/backends/native/meta-kms-plane.c:21:
/usr/local/include/libdrm/drm_mode.h:866:8: note: originally defined here
  866 | struct drm_plane_size_hint {
      |        ^~~~~~~~~~~~~~~~~~~
---
 src/backends/native/meta-kms-plane.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backends/native/meta-kms-plane.c b/src/backends/native/meta-kms-plane.c
index 699dc02dbe1..23e2dea4d2b 100644
--- a/src/backends/native/meta-kms-plane.c
+++ b/src/backends/native/meta-kms-plane.c
@@ -64,7 +64,7 @@ struct _MetaKmsPlane
 };
 
 /* Shall be removed once available on libdrm.*/
-struct drm_plane_size_hint {
+struct meta_drm_plane_size_hint {
   __u16 width;
   __u16 height;
 };
@@ -369,7 +369,7 @@ update_cursor_size_hints (MetaKmsPlane      *plane,
 {
   MetaKmsProp *prop;
   drmModePropertyBlobPtr size_hints_blob = NULL;
-  struct drm_plane_size_hint *size_hints_ptr;
+  struct meta_drm_plane_size_hint *size_hints_ptr;
   uint32_t blob_id, i, num_of_size_hints;
   int fd;
   MetaKmsPlaneType type = meta_kms_plane_get_plane_type (plane);
@@ -392,7 +392,7 @@ update_cursor_size_hints (MetaKmsPlane      *plane,
   plane->size_hints.has_size_hints = TRUE;
   size_hints_ptr = size_hints_blob->data;
 
-  num_of_size_hints = size_hints_blob->length / sizeof (struct drm_plane_size_hint);
+  num_of_size_hints = size_hints_blob->length / sizeof (struct meta_drm_plane_size_hint);
   plane->size_hints.cursor_width = g_new0 (uint64_t, num_of_size_hints);
   plane->size_hints.cursor_height = g_new0 (uint64_t, num_of_size_hints);
   plane->size_hints.num_of_size_hints = num_of_size_hints;
-- 
GitLab

Places

File _service:download_url:3848.patch of Package mutter (Revision 4f16610db6a964b0f7b81d74d7e80010)

Places