Re: [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello Raphael,

On Fri, 18 Oct 2024 21:52:14 +0000
Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote:

> Additionally, make libdrm an optional dependency. Also,
> xlib_libxshmfence is not a required dependency.

Could you clarify whether those "additions" are related to the bump,
i.e made possible by the bump, or are unrelated, and could be done
separately?

> Release notes:
> https://lists.x.org/archives/xorg-announce/2024-October/003532.html

This is not entirely useful, as it's only the release notes for 24.1.3,
but we're bumping from 23.2.4 so there were many other changes.

> diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in
> index 311dae25ec..a4e4a4e46f 100644
> --- a/package/x11r7/xwayland/Config.in
> +++ b/package/x11r7/xwayland/Config.in
> @@ -3,12 +3,10 @@ config BR2_PACKAGE_XWAYLAND
>  	depends on BR2_USE_MMU # fork()
>  	depends on !BR2_STATIC_LIBS # wayland
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
> -	# We need a SHA1 implementation. If either openssl or
> -	# libgcrypt are already part of the build, we'll use one of
> -	# them, otherwise, use the small libsha1 library.
> -	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence
> -	select BR2_PACKAGE_LIBDRM
> -	select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
> +	# We need a SHA1 implementation. If either openssl, libgcrypt, nettle or
> +	# libsha1 are already part of the build, we'll use one of them,
> +	# otherwise, use the small libmd library.
> +	select BR2_PACKAGE_LIBMD if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_NETTLE && !BR2_PACKAGE_LIBSHA1)

Could you explain this change? There's no explanation of it in the
commit log.

> diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash
> index 5bb26bf17e..c7fd2c2ff8 100644
> --- a/package/x11r7/xwayland/xwayland.hash
> +++ b/package/x11r7/xwayland/xwayland.hash
> @@ -1,6 +1,8 @@
> -# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html
> -sha256  a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b  xwayland-23.2.4.tar.xz
> -sha512  ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187  xwayland-23.2.4.tar.xz
> +# Verified from https://xorg.freedesktop.org/archive/individual/xserver/xwayland-24.1.3.tar.xz.sig
> +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540
> +# From https://lists.x.org/archives/xorg-announce/2024-October/003532.html
> +sha256  dcdb57a66cc9b124c8f936760592628ac4e744a7d7b3179aa86189ad7ea4cb10  xwayland-24.1.3.tar.xz
> +sha512  7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d  xwayland-24.1.3.tar.xz
>  
>  # Locally calculated
>  sha256  4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f  COPYING
> diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk
> index c66dd471ac..0621e3547a 100644
> --- a/package/x11r7/xwayland/xwayland.mk
> +++ b/package/x11r7/xwayland/xwayland.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -XWAYLAND_VERSION = 23.2.4
> +XWAYLAND_VERSION = 24.1.3
>  XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz
>  XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver
>  XWAYLAND_LICENSE = MIT
> @@ -12,7 +12,6 @@ XWAYLAND_LICENSE_FILES = COPYING
>  XWAYLAND_CPE_ID_VENDOR = x.org
>  XWAYLAND_INSTALL_STAGING = YES
>  XWAYLAND_DEPENDENCIES = \
> -	libdrm \
>  	pixman \
>  	wayland \
>  	wayland-protocols \
> @@ -20,22 +19,26 @@ XWAYLAND_DEPENDENCIES = \
>  	xlib_libXfont2 \
>  	xlib_libxkbfile \
>  	xlib_libXrandr \
> -	xlib_libxshmfence \
>  	xlib_xtrans \
>  	xorgproto
>  XWAYLAND_CONF_OPTS = \
> -	-Ddri3=true \
> -	-Dxwayland_eglstream=false \
> +	-Dxwayland_ei=false \
>  	-Dxvfb=false \
>  	-Ddefault_font_path=/usr/share/fonts/X11/ \
>  	-Ddtrace=false \
>  	-Ddocs=false
>  
> +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XLIB_LIBXSHMFENCE),yy)
> +XWAYLAND_CONF_OPTS += -Ddri3=true
> +XWAYLAND_DEPENDENCIES += libdrm xlib_libxshmfence
>  ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
>  XWAYLAND_CONF_OPTS += -Dglamor=true
>  XWAYLAND_DEPENDENCIES += libepoxy
>  else
>  XWAYLAND_CONF_OPTS += -Dglamor=false
> +endif # BR2_PACKAGE_LIBEPOXY
> +else
> +XWAYLAND_CONF_OPTS += -Ddri3=false
>  endif

A few more explanations about this in the commit log would also be good
to convince the casual reviewer (like me!) that this makes sense would
be very useful.

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot