Bruce Leidl
3db0a6b032
poky: Upgrade to Yocto 4.1 Langdale meta-citadel/recipes-kernel: citadel-kernel 5.19.9 -> 6.0.8 meta-citadel/recipes-sway: sway 1.5.1 -> 1.7 (meta-wayland) wlroots 0.12.0 -> 0.15.1 (meta-wayland) meta-gnome/recipes-connectivity: iwd 1.27 -> 1.30 (meta-oe) modemmanager 1.18.2 -> 1.18.6 (meta-oe) networkmanager 1.36.2 -> 1.40.0 (meta-oe) meta-gnome/recipes-freedesktop: libgusb 0.3.7 -> 0.3.10 (meta-oe) meta-gnome/recipes-gnome: adwaita-icon-theme 42 -> 43 (oe-core) geocode-glib 3.26.2 -> 3.26.4 (meta-oe) gjs 1.72.0 -> 1.73.2 (meta-oe) gnome-bluetooth 42.0 -> 42.4 (meta-oe) gnome-control-center 42.1 -> 43.0 gnome-desktop 42.1 -> 43.rc gnome-settings-daemon 42.1 -> 43.0 gnome-shell 42.1 -> 43.0 gsettings-desktop-schema 41.0 -> 43.0 gtk4 4.6.4 -> 4.6.7 (meta-oe) gvfs 1.50.0 -> 1.50.2 (meta-oe) libadwaita 1.1.1 -> 1.2.0 (meta-oe) libgee 0.20.4 -> 0.20.6 (meta-oe) mutter 42.1 -> 43.0 rest 0.8.1 -> 0.9.0 (meta-oe) meta-gnome/recipes-support: ell 0.50 -> 0.53 (poky) exiv2 0.26 -> 0.27.3 (meta-oe) graphene 1.10.2 -> 1.10.8 (meta-oe) gsound 1.0.2 -> 1.0.3 (meta-oe) icu_71.1 (removed from meta-gnome because this version is in poky) jansson 2.12 -> 2.14 (meta-oe) lcms 2.9 -> 2.14 (meta-oe) libdvdread 6.1.1 -> 6.1.3 (meta-oe) libndp 1.6 -> 1.8 (meta-oe) mozjs 91.8.0 -> 102.3.0 power-profiles-daemon 0.12 (new-recipe)
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Wed, 14 Sep 2022 09:07:10 +0200
|
|
Subject: [PATCH] wayland-info: Fix build without libdrm
|
|
|
|
wayland-info can optionally use libdrm to provide a description of the
|
|
dmabuf format modifiers.
|
|
|
|
When not using libdrm however, the build fails because "dev_t" is not
|
|
defined.
|
|
|
|
The definition of "dev_t" comes from <sys/types.h> which is included
|
|
from <libdrm.h>, which is not included without libdrm support, hence the
|
|
build failure.
|
|
|
|
Simply include <sys/types.h> unconditionally to make sure "dev_t" is
|
|
defined regardless of libdrm support, to fix the build failure.
|
|
|
|
Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Fixes: 240cb739 - "Add support for linux_dmabuf version 4"
|
|
Reviewed-by: Simon Ser <contact@emersion.fr>
|
|
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
|
|
|
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
wayland-info/wayland-info.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c
|
|
index 53cd04b..98ff205 100644
|
|
--- a/wayland-info/wayland-info.c
|
|
+++ b/wayland-info/wayland-info.c
|
|
@@ -34,6 +34,7 @@
|
|
#include <ctype.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
+#include <sys/types.h>
|
|
|
|
#include <wayland-client.h>
|
|
#if HAVE_HUMAN_FORMAT_MODIFIER
|