Re: [ptxdist] [PATCH] mesalib: version bump 22.2.4 -> 22.3.0

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

On Thu, Dec 01, 2022 at 10:09:30AM +0100, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

Note that with this version, the EGL headers disable X11 by default. If
needed, it can be enabled by defining USE_X11. I added a patch for Qt 5 to
fix this there.

Michael

> ---
>  rules/host-mesalib.make |  5 ++---
>  rules/mesalib.make      | 10 +++++-----
>  2 files changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> index 43e49fe92417..c8ebf30e64b1 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -42,10 +42,11 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Dgallium-nine=false \
>  	-Dgallium-omx=disabled \
>  	-Dgallium-opencl=disabled \
> +	-Dgallium-rusticl=false \
>  	-Dgallium-va=disabled \
>  	-Dgallium-vdpau=disabled \
> +	-Dgallium-windows-dll-name=libgallium_wgl \
>  	-Dgallium-xa=disabled \
> -	-Dgallium-xvmc=disabled \
>  	-Dgbm=disabled \
>  	-Dgbm-backends-path= \
>  	-Dgles-lib-suffix= \
> @@ -66,7 +67,6 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Dmin-windows-version=8 \
>  	-Dmoltenvk-dir= \
>  	-Domx-libs-path=/usr/lib/dri \
> -	-Dopencl-native=false \
>  	-Dopencl-spirv=false \
>  	-Dopengl=true \
>  	-Dosmesa=false \
> @@ -96,7 +96,6 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Dvulkan-icd-dir=/etc/vulkan/icd.d \
>  	-Dvulkan-layers=[] \
>  	-Dxlib-lease=disabled \
> -	-Dxvmc-libs-path=/usr/lib \
>  	-Dzlib=enabled \
>  	-Dzstd=disabled
>  
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 6f845fa34c92..19bb39433872 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION	:= 22.2.4
> -MESALIB_MD5	:= a258a3d590d76bc1ff89a204f063e3b8
> +MESALIB_VERSION	:= 22.3.0
> +MESALIB_MD5	:= f44da76e397e35a5dd9b35caa0a09dea
>  MESALIB		:= mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX	:= tar.xz
>  MESALIB_URL	:= \
> @@ -152,6 +152,7 @@ MESALIB_CONF_OPT	:= \
>  	-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
>  	-Degl-lib-suffix= \
>  	-Degl-native-platform=auto \
> +	-Denable-glcpp-tests=false \
>  	-Dexecmem=true \
>  	-Dfreedreno-kgsl=false \
>  	-Dfreedreno-virtio=false \
> @@ -162,10 +163,11 @@ MESALIB_CONF_OPT	:= \
>  	-Dgallium-nine=false \
>  	-Dgallium-omx=disabled \
>  	-Dgallium-opencl=disabled \
> +	-Dgallium-rusticl=false \
>  	-Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \
>  	-Dgallium-vdpau=disabled \
> +	-Dgallium-windows-dll-name=libgallium_wgl \
>  	-Dgallium-xa=disabled \
> -	-Dgallium-xvmc=disabled \
>  	-Dgbm=$(call ptx/endis, PTXCONF_MESALIB_GBM)d \
>  	-Dgbm-backends-path= \
>  	-Dgles-lib-suffix= \
> @@ -186,7 +188,6 @@ MESALIB_CONF_OPT	:= \
>  	-Dmin-windows-version=8 \
>  	-Dmoltenvk-dir= \
>  	-Domx-libs-path=/usr/lib/dri \
> -	-Dopencl-native=false \
>  	-Dopencl-spirv=false \
>  	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
>  	-Dosmesa=false \
> @@ -216,7 +217,6 @@ MESALIB_CONF_OPT	:= \
>  	-Dvulkan-icd-dir=/etc/vulkan/icd.d \
>  	-Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
>  	-Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
> -	-Dxvmc-libs-path=/usr/lib \
>  	-Dzlib=enabled \
>  	-Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |