1*4882a593SmuzhiyunFrom 3657a11d45f133776b50c716d99f37965eb07ed1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Olivier Fourdan <ofourdan@redhat.com> 3*4882a593SmuzhiyunDate: Wed, 14 Sep 2022 09:07:10 +0200 4*4882a593SmuzhiyunSubject: [PATCH] wayland-info: Fix build without libdrm 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunwayland-info can optionally use libdrm to provide a description of the 7*4882a593Smuzhiyundmabuf format modifiers. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunWhen not using libdrm however, the build fails because "dev_t" is not 10*4882a593Smuzhiyundefined. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunThe definition of "dev_t" comes from <sys/types.h> which is included 13*4882a593Smuzhiyunfrom <libdrm.h>, which is not included without libdrm support, hence the 14*4882a593Smuzhiyunbuild failure. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSimply include <sys/types.h> unconditionally to make sure "dev_t" is 17*4882a593Smuzhiyundefined regardless of libdrm support, to fix the build failure. 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunCloses: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 20*4882a593SmuzhiyunSigned-off-by: Olivier Fourdan <ofourdan@redhat.com> 21*4882a593SmuzhiyunFixes: 240cb739 - "Add support for linux_dmabuf version 4" 22*4882a593SmuzhiyunReviewed-by: Simon Ser <contact@emersion.fr> 23*4882a593SmuzhiyunReviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com> 24*4882a593Smuzhiyun(cherry picked from commit baa65ba9f62e6a05c32b9202b524158a21f24245) 25*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com> 26*4882a593Smuzhiyun[james.hilliard1@gmail.com: backport from upstream commit 27*4882a593Smuzhiyun3657a11d45f133776b50c716d99f37965eb07ed1] 28*4882a593Smuzhiyun--- 29*4882a593Smuzhiyun wayland-info/wayland-info.c | 1 + 30*4882a593Smuzhiyun 1 file changed, 1 insertion(+) 31*4882a593Smuzhiyun 32*4882a593Smuzhiyundiff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c 33*4882a593Smuzhiyunindex 53cd04b..98ff205 100644 34*4882a593Smuzhiyun--- a/wayland-info/wayland-info.c 35*4882a593Smuzhiyun+++ b/wayland-info/wayland-info.c 36*4882a593Smuzhiyun@@ -34,6 +34,7 @@ 37*4882a593Smuzhiyun #include <ctype.h> 38*4882a593Smuzhiyun #include <unistd.h> 39*4882a593Smuzhiyun #include <sys/mman.h> 40*4882a593Smuzhiyun+#include <sys/types.h> 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun #include <wayland-client.h> 43*4882a593Smuzhiyun #if HAVE_HUMAN_FORMAT_MODIFIER 44*4882a593Smuzhiyun-- 45*4882a593Smuzhiyun2.34.1 46*4882a593Smuzhiyun 47