From eb6c3c5a84453d23bdacfc3f51ef03b958948c83 Mon Sep 17 00:00:00 2001 From: Andy Hu Date: Thu, 1 Jun 2023 22:17:39 +0800 Subject: [PATCH] package/wayland-utils: bump to version 1.1.0 keep version same with the offical buildroot tag 2022.08 Signed-off-by: Andy Hu --- ...ayland-info-Fix-build-without-libdrm.patch | 46 +++++++++++++++++++ package/wayland-utils/wayland-utils.hash | 10 ++-- package/wayland-utils/wayland-utils.mk | 11 ++++- 3 files changed, 60 insertions(+), 7 deletions(-) create mode 100755 package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch mode change 100644 => 100755 package/wayland-utils/wayland-utils.hash mode change 100644 => 100755 package/wayland-utils/wayland-utils.mk diff --git a/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch b/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch new file mode 100755 index 00000000..2d4591f7 --- /dev/null +++ b/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch @@ -0,0 +1,46 @@ +From 3657a11d45f133776b50c716d99f37965eb07ed1 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 +(cherry picked from commit baa65ba9f62e6a05c32b9202b524158a21f24245) +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +3657a11d45f133776b50c716d99f37965eb07ed1] +--- + 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 +-- +2.34.1 + diff --git a/package/wayland-utils/wayland-utils.hash b/package/wayland-utils/wayland-utils.hash old mode 100644 new mode 100755 index 00b6da40..c9b16e05 --- a/package/wayland-utils/wayland-utils.hash +++ b/package/wayland-utils/wayland-utils.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-July/041565.html -md5 714875aefb10e7f683cde24e58d033ad wayland-utils-1.0.0.tar.xz -sha1 b5b8d498a892866d56ffbe862039d7c97acbe7bc wayland-utils-1.0.0.tar.xz -sha256 64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0 wayland-utils-1.0.0.tar.xz -sha512 4c6f1822435b36b3acd361c0c54e56150e8a2697a9c4b2c20a149fcfaafe237e45807df3471884ddf594d89558001099e2d938e3f48988ba6950a0f1e3538db2 wayland-utils-1.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-September/042399.html +md5 1a398cbb75c3ac1ac231b2a8f84bd6d6 wayland-utils-1.1.0.tar.xz +sha1 38e5c37f5b35b86a84289659b4b0796811eb66cd wayland-utils-1.1.0.tar.xz +sha256 9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a wayland-utils-1.1.0.tar.xz +sha512 5b841ecb9b534a9b353e104dda9410961495495380fa65e32ef40855750609b03942a87c2fd66339aab57c05b3b8699e2bee055cfd44151f9609a5f6c53349df wayland-utils-1.1.0.tar.xz sha256 1eba39c11640014a5841dd3017e5245fc31f47e1cf43a3287a286dd6a8de8a1a COPYING diff --git a/package/wayland-utils/wayland-utils.mk b/package/wayland-utils/wayland-utils.mk old mode 100644 new mode 100755 index 30a33b61..bc648a69 --- a/package/wayland-utils/wayland-utils.mk +++ b/package/wayland-utils/wayland-utils.mk @@ -4,11 +4,18 @@ # ################################################################################ -WAYLAND_UTILS_VERSION = 1.0.0 -WAYLAND_UTILS_SITE = https://wayland.freedesktop.org/releases +WAYLAND_UTILS_VERSION = 1.1.0 +WAYLAND_UTILS_SITE = https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads WAYLAND_UTILS_SOURCE = wayland-utils-$(WAYLAND_UTILS_VERSION).tar.xz WAYLAND_UTILS_LICENSE = MIT WAYLAND_UTILS_LICENSE_FILES = COPYING WAYLAND_UTILS_DEPENDENCIES = host-pkgconf wayland wayland-protocols +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WAYLAND_UTILS_DEPENDENCIES += libdrm +WAYLAND_UTILS_CONF_OPTS += -Ddrm=enabled +else +WAYLAND_UTILS_CONF_OPTS += -Ddrm=disabled +endif + $(eval $(meson-package))