From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 16 Jun 2023 15:57:30 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qA9xD-0094Gc-VD for lore@lore.pengutronix.de; Fri, 16 Jun 2023 15:57:30 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qA9xB-0001c1-Ma; Fri, 16 Jun 2023 15:57:29 +0200 Received: from lupine.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::4e]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qA9we-0001b9-Io; Fri, 16 Jun 2023 15:56:56 +0200 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Fri, 16 Jun 2023 15:56:55 +0200 Message-Id: <20230616135655.42555-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2] wayland-utils: version bump 1.1.0 -> 1.2.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Enable libdrm dependency to support printing modifier names. Signed-off-by: Philipp Zabel --- 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 -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 ---- - 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 - #include - #include -+#include - - #include - #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