Enable libdrm dependency to support printing modifier names. Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- v2: drop mainlined patch --- ...ayland-info-Fix-build-without-libdrm.patch | 38 ------------------- patches/wayland-utils-1.1.0/series | 4 -- rules/wayland-utils.in | 1 + rules/wayland-utils.make | 7 ++-- 4 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch delete mode 100644 patches/wayland-utils-1.1.0/series
diff --git a/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch b/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch deleted file mode 100644 index 2b994421aed7..000000000000 --- a/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch +++ /dev/null @@ -1,38 +0,0 @@ -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> ---- - 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 53cd04bcb95e..98ff2052add7 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/patches/wayland-utils-1.1.0/series b/patches/wayland-utils-1.1.0/series deleted file mode 100644 index 21f38d9d7b38..000000000000 --- a/patches/wayland-utils-1.1.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-wayland-info-Fix-build-without-libdrm.patch -# bcd03cd405a631566145d1b0ddee2dc4 - git-ptx-patches magic diff --git a/rules/wayland-utils.in b/rules/wayland-utils.in index 49161fcc1797..65ddd9c9afe5 100644 --- a/rules/wayland-utils.in +++ b/rules/wayland-utils.in @@ -3,6 +3,7 @@ config WAYLAND_UTILS tristate select HOST_MESON + select LIBDRM select WAYLAND select WAYLAND_PROTOCOLS prompt "wayland-utils" diff --git a/rules/wayland-utils.make b/rules/wayland-utils.make index 28c2f493baa1..cc90ecc447f5 100644 --- a/rules/wayland-utils.make +++ b/rules/wayland-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_UTILS) += wayland-utils # # Paths and names # -WAYLAND_UTILS_VERSION := 1.1.0 -WAYLAND_UTILS_MD5 := 1a398cbb75c3ac1ac231b2a8f84bd6d6 +WAYLAND_UTILS_VERSION := 1.2.0 +WAYLAND_UTILS_MD5 := 736dbcefc534407d4e774087726844a1 WAYLAND_UTILS := wayland-utils-$(WAYLAND_UTILS_VERSION) WAYLAND_UTILS_SUFFIX := tar.xz WAYLAND_UTILS_URL := https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads/$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) @@ -33,7 +33,8 @@ WAYLAND_UTILS_LICENSE_FILES := file://COPYING;md5=548a66038a77415e1df51118625e83 # WAYLAND_UTILS_CONF_TOOL := meson WAYLAND_UTILS_CONF_OPT := \ - $(CROSS_MESON_USR) + $(CROSS_MESON_USR) \ + -Ddrm=enabled # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2
