[ptxdist] [PATCH 1/2] xwayland: fix build with glx without glamor

[ptxdist] [PATCH 1/2] xwayland: fix build with glx without glamor

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/xwayland.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xwayland.in b/rules/xwayland.in
index a662ec2ec032..c2b0de95b280 100644
--- a/rules/xwayland.in
+++ b/rules/xwayland.in
@@ -20,7 +20,7 @@ menuconfig XWAYLAND
 	select XORG_LIB_XSHMFENCE
 	select XORG_LIB_XTRANS
 	select LIBEPOXY			if XWAYLAND_GLAMOR
-	select MESALIB			if XWAYLAND_GLAMOR
+	select MESALIB			if XWAYLAND_GLAMOR || XWAYLAND_EXT_GLX
 	select MESALIB_GBM		if XWAYLAND_GLAMOR
 	select MESALIB_GLX		if XWAYLAND_EXT_GLX
 	select XORG_LIB_XV		if XWAYLAND_EXT_XV
-- 
2.39.2

[ptxdist] [PATCH 2/2] xwayland: version bump 23.2.4 -> 24.1.2

[Philipp Zabel]

XACE is effectively mandatory since commit a07c2cda9841 ("xwayland: Add
an XACE property access handler").

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/xwayland.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/xwayland.make b/rules/xwayland.make
index fae736d93d72..fe78b8954d9e 100644
--- a/rules/xwayland.make
+++ b/rules/xwayland.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XWAYLAND) += xwayland
 #
 # Paths and names
 #
-XWAYLAND_VERSION	:= 23.2.4
-XWAYLAND_MD5		:= 9d04fbe9c3a531c9cd08d38f51788ae6
+XWAYLAND_VERSION	:= 24.1.2
+XWAYLAND_MD5		:= 312c5cf17d1b147df1b787fd170958e1
 XWAYLAND		:= xwayland-$(XWAYLAND_VERSION)
 XWAYLAND_SUFFIX		:= tar.xz
 XWAYLAND_URL		:= $(call ptx/mirror, XORG, individual/xserver/$(XWAYLAND).$(XWAYLAND_SUFFIX))
@@ -60,10 +60,11 @@ XWAYLAND_CONF_OPT	:= \
 	-Dsecure-rpc=false \
 	-Dserverconfigdir= \
 	-Dsha1=libnettle \
+	-Dsystemd_notify=false \
 	-Dvendor_name=PTXdist \
 	-Dvendor_name_short=PTXdist \
 	-Dvendor_web=https://www.ptxdist.org/ \
-	-Dxace=false \
+	-Dxace=true \
 	-Dxcsecurity=false \
 	-Dxdm-auth-1=false \
 	-Dxdmcp=false \
@@ -82,7 +83,6 @@ XWAYLAND_CONF_OPT	:= \
 	-Dxv=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_XV) \
 	-Dxvfb=false \
 	-Dxwayland-path= \
-	-Dxwayland_eglstream=false \
 	-Dxwayland_ei=false
 
 # ----------------------------------------------------------------------------
-- 
2.39.2

Re: [ptxdist] [APPLIED] xwayland: version bump 23.2.4 -> 24.1.2

[Michael Olbrich]

Thanks, applied as e557e6441e6be6bddd4949b34398931679ddf96f.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:49 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> XACE is effectively mandatory since commit a07c2cda9841 ("xwayland: Add
> an XACE property access handler").
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115743.2888439-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xwayland.make b/rules/xwayland.make
> index fae736d93d72..fe78b8954d9e 100644
> --- a/rules/xwayland.make
> +++ b/rules/xwayland.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XWAYLAND) += xwayland
>  #
>  # Paths and names
>  #
> -XWAYLAND_VERSION	:= 23.2.4
> -XWAYLAND_MD5		:= 9d04fbe9c3a531c9cd08d38f51788ae6
> +XWAYLAND_VERSION	:= 24.1.2
> +XWAYLAND_MD5		:= 312c5cf17d1b147df1b787fd170958e1
>  XWAYLAND		:= xwayland-$(XWAYLAND_VERSION)
>  XWAYLAND_SUFFIX		:= tar.xz
>  XWAYLAND_URL		:= $(call ptx/mirror, XORG, individual/xserver/$(XWAYLAND).$(XWAYLAND_SUFFIX))
> @@ -60,10 +60,11 @@ XWAYLAND_CONF_OPT	:= \
>  	-Dsecure-rpc=false \
>  	-Dserverconfigdir= \
>  	-Dsha1=libnettle \
> +	-Dsystemd_notify=false \
>  	-Dvendor_name=PTXdist \
>  	-Dvendor_name_short=PTXdist \
>  	-Dvendor_web=https://www.ptxdist.org/ \
> -	-Dxace=false \
> +	-Dxace=true \
>  	-Dxcsecurity=false \
>  	-Dxdm-auth-1=false \
>  	-Dxdmcp=false \
> @@ -82,7 +83,6 @@ XWAYLAND_CONF_OPT	:= \
>  	-Dxv=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_XV) \
>  	-Dxvfb=false \
>  	-Dxwayland-path= \
> -	-Dxwayland_eglstream=false \
>  	-Dxwayland_ei=false
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] xwayland: fix build with glx without glamor

[Michael Olbrich]

Thanks, applied as 7cb6f66cc94fd8a59b380a1208c669081d79edb0.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:48 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115743.2888439-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xwayland.in b/rules/xwayland.in
> index a662ec2ec032..c2b0de95b280 100644
> --- a/rules/xwayland.in
> +++ b/rules/xwayland.in
> @@ -20,7 +20,7 @@ menuconfig XWAYLAND
>  	select XORG_LIB_XSHMFENCE
>  	select XORG_LIB_XTRANS
>  	select LIBEPOXY			if XWAYLAND_GLAMOR
> -	select MESALIB			if XWAYLAND_GLAMOR
> +	select MESALIB			if XWAYLAND_GLAMOR || XWAYLAND_EXT_GLX
>  	select MESALIB_GBM		if XWAYLAND_GLAMOR
>  	select MESALIB_GLX		if XWAYLAND_EXT_GLX
>  	select XORG_LIB_XV		if XWAYLAND_EXT_XV