Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pi...@baylibre.com> --- ...ayland-info-Fix-build-without-libdrm.patch | 42 ------------------- ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (82%)
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 deleted file mode 100644 index 86c44d4480..0000000000 --- a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <ofour...@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 <ofour...@redhat.com> -Fixes: 240cb739 - "Add support for linux_dmabuf version 4" -Reviewed-by: Simon Ser <cont...@emersion.fr> -Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.com> - -Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] -Signed-off-by: Alexander Kanavin <a...@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.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb similarity index 82% rename from meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb rename to meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index dcee87e2cd..16a5dc072c 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb @@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ " 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] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a" +SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183273): https://lists.openembedded.org/g/openembedded-core/message/183273 Mute This Topic: https://lists.openembedded.org/mt/99702159/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-