From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Nov 2022 14:20:58 +0100 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 1oxTCs-00FSWj-PT for lore@lore.pengutronix.de; Tue, 22 Nov 2022 14:20:58 +0100 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 1oxTCr-0000S2-Iz; Tue, 22 Nov 2022 14:20:57 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oxTCG-0006xm-IP; Tue, 22 Nov 2022 14:20:20 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oxTCF-005rWc-0N; Tue, 22 Nov 2022 14:20:19 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oxTCF-00DFz6-B1; Tue, 22 Nov 2022 14:20:19 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 22 Nov 2022 14:20:19 +0100 Message-Id: <20221122132019.3159665-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221118201301.1496741-1-christian.melki@t2data.com> References: <20221118201301.1496741-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] wayland-utils: Version bump. 1.0.0 -> 1.1.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: Christian Melki 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 Thanks, applied as 9893ec6d3ab823fce6659d5ff474d0691af78b4d. Michael [sent from post-receive hook] On Tue, 22 Nov 2022 14:20:19 +0100, Christian Melki wrote: > Some bugfixes and enhancement of this rather new tool. > > * Add patch to make it build without libdrm. > Adding libdrm enhances output, but is not needed. > In reality, libdrm is most likely going to be there. > > * Move URL to gitlab one. This release isn't hosted on > the old URL yet (any more?). > > Signed-off-by: Christian Melki > Message-Id: <20221118201301.1496741-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 > new file mode 100644 > index 000000000000..2b994421aed7 > --- /dev/null > +++ b/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch > @@ -0,0 +1,38 @@ > +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 > new file mode 100644 > index 000000000000..21f38d9d7b38 > --- /dev/null > +++ b/patches/wayland-utils-1.1.0/series > @@ -0,0 +1,4 @@ > +# 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.make b/rules/wayland-utils.make > index 91942385bcdc..28c2f493baa1 100644 > --- a/rules/wayland-utils.make > +++ b/rules/wayland-utils.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_WAYLAND_UTILS) += wayland-utils > # > # Paths and names > # > -WAYLAND_UTILS_VERSION := 1.0.0 > -WAYLAND_UTILS_MD5 := 714875aefb10e7f683cde24e58d033ad > +WAYLAND_UTILS_VERSION := 1.1.0 > +WAYLAND_UTILS_MD5 := 1a398cbb75c3ac1ac231b2a8f84bd6d6 > WAYLAND_UTILS := wayland-utils-$(WAYLAND_UTILS_VERSION) > WAYLAND_UTILS_SUFFIX := tar.xz > -WAYLAND_UTILS_URL := https://wayland.freedesktop.org/releases//$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) > +WAYLAND_UTILS_URL := https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads/$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) > WAYLAND_UTILS_SOURCE := $(SRCDIR)/$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) > WAYLAND_UTILS_DIR := $(BUILDDIR)/$(WAYLAND_UTILS) > WAYLAND_UTILS_LICENSE := MIT