diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-09-13 17:43:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-14 09:19:34 +0100 |
commit | 5a19398422e317333ed22ff7d632cd973d0c30d5 (patch) | |
tree | 7790d8e2ced0b97dde6ae84af23622c7b619b95b /meta/recipes-graphics | |
parent | 6c4e3ae5c806e46834bc9cafacdf8ae691db35d5 (diff) | |
download | openembedded-core-contrib-5a19398422e317333ed22ff7d632cd973d0c30d5.tar.gz |
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
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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.2.0.bb (renamed from meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb) | 6 |
2 files changed, 2 insertions, 46 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 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 <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.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index 48e1409be8..657f67fb09 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb @@ -9,10 +9,8 @@ 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" +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" |