diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:57 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:23:26 +0100 |
| commit | 8ead46f5a420eea0aa3718f7511cc2cebe6650ba (patch) | |
| tree | 186852bf39ee0d635bd662b2a34d26e5b6e4565e /meta/recipes-graphics/wayland | |
| parent | c9d245a78a22542ea4fb063370974ac1c85be74d (diff) | |
| download | openembedded-core-8ead46f5a420eea0aa3718f7511cc2cebe6650ba.tar.gz | |
wayland-utils: update 1.0.0 -> 1.1.0
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-graphics/wayland')
| -rw-r--r-- | meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb (renamed from meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb) | 5 |
2 files changed, 45 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch b/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch new file mode 100644 index 0000000000..86c44d4480 --- /dev/null +++ b/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch @@ -0,0 +1,42 @@ +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 diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb index 4c51f7e8c5..dcee87e2cd 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb @@ -9,9 +9,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ " -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ + file://0001-wayland-info-Fix-build-without-libdrm.patch \ " -SRC_URI[sha256sum] = "64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0" +SRC_URI[sha256sum] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |