Re: [ptxdist] [APPLIED] wayland-utils: Version bump. 1.0.0 -> 1.1.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 9893ec6d3ab823fce6659d5ff474d0691af78b4d.

Michael

[sent from post-receive hook]

On Tue, 22 Nov 2022 14:20:19 +0100, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20221118201301.1496741-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 <ofourdan@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 <ofourdan@redhat.com>
> +Fixes: 240cb739 - "Add support for linux_dmabuf version 4"
> +Reviewed-by: Simon Ser <contact@emersion.fr>
> +Reviewed-by: Pekka Paalanen <pekka.paalanen@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
> 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