From adbf02fd313ab3b860fc3e1939735c949fbd9112 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 13 Sep 2023 17:43:49 +0800 Subject: wayland-utils: upgrade 1.1.0 -> 1.2.0 0001-wayland-info-Fix-build-without-libdrm.patch removed since it's included in 1.2.0 Changelog: =========== -wayland-info: Fix spurious tab/space -wayland-info: add drm-lease-v1 support -meson: improve protocol generation -wayland-info: Destroy zwp_linux_dmabuf_feedback_v1 proxy on exit -wayland-info: Readd support for linux_dmabuf versions < 3 -wayland-info: Add a cmdline option for interface -wayland-info: print DRM device paths -build: turn on -Wundef -wayland-info: move libdrm version constraint to dependency() -wayland-info: include system headers with angle brackets -wayland-info: Fix build without libdrm -1build: reopen main for regular development (From OE-Core rev: 5a19398422e317333ed22ff7d632cd973d0c30d5) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...001-wayland-info-Fix-build-without-libdrm.patch | 42 ---------------------- .../wayland/wayland-utils_1.1.0.bb | 24 ------------- .../wayland/wayland-utils_1.2.0.bb | 22 ++++++++++++ 3 files changed, 22 insertions(+), 66 deletions(-) delete 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.1.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb (limited to 'meta/recipes-graphics') 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 -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.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb deleted file mode 100644 index 48e1409be8..0000000000 --- a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb +++ /dev/null @@ -1,24 +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://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" - -PACKAGECONFIG ??= "drm" -PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb new file mode 100644 index 0000000000..657f67fb09 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb @@ -0,0 +1,22 @@ +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" +SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig + +DEPENDS += "wayland wayland-native wayland-protocols" + +PACKAGECONFIG ??= "drm" +PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" -- cgit v1.2.3-54-g00ecf