From 8ead46f5a420eea0aa3718f7511cc2cebe6650ba Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Oct 2022 22:15:57 +0200 Subject: wayland-utils: update 1.0.0 -> 1.1.0 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- ...001-wayland-info-Fix-build-without-libdrm.patch | 42 ++++++++++++++++++++++ .../wayland/wayland-utils_1.0.0.bb | 20 ----------- .../wayland/wayland-utils_1.1.0.bb | 21 +++++++++++ 3 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch delete mode 100644 meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb (limited to 'meta/recipes-graphics/wayland') 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 +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 which is included +from , which is not included without libdrm support, hence the +build failure. + +Simply include 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 +Fixes: 240cb739 - "Add support for linux_dmabuf version 4" +Reviewed-by: Simon Ser +Reviewed-by: Pekka Paalanen + +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] +Signed-off-by: Alexander Kanavin +--- + 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 + #include + #include ++#include + + #include + #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.0.0.bb deleted file mode 100644 index 4c51f7e8c5..0000000000 --- a/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Wayland utilities" -DESCRIPTION = "Wayland-utils contains (for now) \ -wayland-info, a utility for displaying information about the Wayland \ -protocols supported by a Wayland compositor. \ -wayland-info is basically a standalone version of weston-info as found \ -in weston repository. " -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ - " - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - " -SRC_URI[sha256sum] = "64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig - -DEPENDS += "wayland wayland-native wayland-protocols" diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb new file mode 100644 index 0000000000..dcee87e2cd --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Wayland utilities" +DESCRIPTION = "Wayland-utils contains (for now) \ +wayland-info, a utility for displaying information about the Wayland \ +protocols supported by a Wayland compositor. \ +wayland-info is basically a standalone version of weston-info as found \ +in weston repository. " +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +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" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig + +DEPENDS += "wayland wayland-native wayland-protocols" -- cgit 1.2.3-korg