From 6daa5562fe6cf86fdefc261a6e03200731c00151 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 25 Jul 2023 08:49:51 -0600 Subject: [PATCH] package/wayland-utils: bump to version 1.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...ayland-info-Fix-build-without-libdrm.patch | 46 ------------------- package/wayland-utils/wayland-utils.hash | 8 ++-- package/wayland-utils/wayland-utils.mk | 2 +- 4 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch diff --git a/.checkpackageignore b/.checkpackageignore index b9265ae2e4..8eb88813c9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1567,7 +1567,6 @@ package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch Up package/wampcc/0003-Broken-build-on-Windows.patch Upstream package/watchdogd/S01watchdogd Indent NotExecutable package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch Upstream -package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch Upstream package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch Upstream package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch Upstream package/wget/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream 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 deleted file mode 100644 index 2d4591f785..0000000000 --- a/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 index c9b16e0535..fd14b986bc 100644 --- a/package/wayland-utils/wayland-utils.hash +++ b/package/wayland-utils/wayland-utils.hash @@ -1,6 +1,4 @@ -# 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 +# From https://lists.freedesktop.org/archives/wayland-devel/2023-June/042736.html +sha256 d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4 wayland-utils-1.2.0.tar.xz +sha512 dc69a2d88215b54486954bd9f6e91cd158b0c0b94dccd2c863477cf6b1e83a83db4466f0718aa7d2be4de8d06484c0672c79318bc5c2b1f082f893fe795c2c00 wayland-utils-1.2.0.tar.xz sha256 1eba39c11640014a5841dd3017e5245fc31f47e1cf43a3287a286dd6a8de8a1a COPYING diff --git a/package/wayland-utils/wayland-utils.mk b/package/wayland-utils/wayland-utils.mk index bc648a6904..efeb7e57a8 100644 --- a/package/wayland-utils/wayland-utils.mk +++ b/package/wayland-utils/wayland-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_UTILS_VERSION = 1.1.0 +WAYLAND_UTILS_VERSION = 1.2.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