[ptxdist] [PATCH] wayland-protocols: version bump 1.20 -> 1.21

[ptxdist] [PATCH] wayland-protocols: version bump 1.20 -> 1.21

[Philipp Zabel]

Switch to Meson build system, add xdg_activation_v1 staging protocol.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/wayland-protocols.in   |  1 +
 rules/wayland-protocols.make | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rules/wayland-protocols.in b/rules/wayland-protocols.in
index dae00d827bb6..c9fab305be98 100644
--- a/rules/wayland-protocols.in
+++ b/rules/wayland-protocols.in
@@ -2,6 +2,7 @@
 
 config WAYLAND_PROTOCOLS
 	tristate
+	select HOST_MESON
 	select WAYLAND
 	prompt "wayland protocols"
 	help
diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
index 93b821cf447a..3820aa6a03b4 100644
--- a/rules/wayland-protocols.make
+++ b/rules/wayland-protocols.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
 #
 # Paths and names
 #
-WAYLAND_PROTOCOLS_VERSION	:= 1.20
-WAYLAND_PROTOCOLS_MD5		:= b0836533a3f2dc6585b1dae00341157f
+WAYLAND_PROTOCOLS_VERSION	:= 1.21
+WAYLAND_PROTOCOLS_MD5		:= 8196416baac07cd833bcb86b69da41a7
 WAYLAND_PROTOCOLS		:= wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 WAYLAND_PROTOCOLS_SUFFIX	:= tar.xz
 WAYLAND_PROTOCOLS_URL		:= https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
@@ -24,8 +24,11 @@ WAYLAND_PROTOCOLS_DIR		:= $(BUILDDIR)/$(WAYLAND_PROTOCOLS)
 WAYLAND_PROTOCOLS_LICENSE	:= MIT
 
 #
-# autoconf
+# meson
 #
-WAYLAND_PROTOCOLS_CONF_TOOL	:= autoconf
+WAYLAND_PROTOCOLS_CONF_TOOL	:= meson
+WAYLAND_PROTOCOLS_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-Dtests=false
 
 # vim: syntax=make
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] wayland-protocols: version bump 1.20 -> 1.21

[Michael Olbrich]

Thanks, applied as 2fcabbde6e2020edfb962e47cafb3be064058319.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:20 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Switch to Meson build system, add xdg_activation_v1 staging protocol.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210430173227.7492-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/wayland-protocols.in b/rules/wayland-protocols.in
> index dae00d827bb6..c9fab305be98 100644
> --- a/rules/wayland-protocols.in
> +++ b/rules/wayland-protocols.in
> @@ -2,6 +2,7 @@
>  
>  config WAYLAND_PROTOCOLS
>  	tristate
> +	select HOST_MESON
>  	select WAYLAND
>  	prompt "wayland protocols"
>  	help
> diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
> index 93b821cf447a..3820aa6a03b4 100644
> --- a/rules/wayland-protocols.make
> +++ b/rules/wayland-protocols.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
>  #
>  # Paths and names
>  #
> -WAYLAND_PROTOCOLS_VERSION	:= 1.20
> -WAYLAND_PROTOCOLS_MD5		:= b0836533a3f2dc6585b1dae00341157f
> +WAYLAND_PROTOCOLS_VERSION	:= 1.21
> +WAYLAND_PROTOCOLS_MD5		:= 8196416baac07cd833bcb86b69da41a7
>  WAYLAND_PROTOCOLS		:= wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
>  WAYLAND_PROTOCOLS_SUFFIX	:= tar.xz
>  WAYLAND_PROTOCOLS_URL		:= https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
> @@ -24,8 +24,11 @@ WAYLAND_PROTOCOLS_DIR		:= $(BUILDDIR)/$(WAYLAND_PROTOCOLS)
>  WAYLAND_PROTOCOLS_LICENSE	:= MIT
>  
>  #
> -# autoconf
> +# meson
>  #
> -WAYLAND_PROTOCOLS_CONF_TOOL	:= autoconf
> +WAYLAND_PROTOCOLS_CONF_TOOL	:= meson
> +WAYLAND_PROTOCOLS_CONF_OPT	:= \
> +	$(CROSS_MESON_USR) \
> +	-Dtests=false
>  
>  # vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de