Re: [ptxdist] [APPLIED] mesalib: version bump 23.1.9 -> 23.3.0

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

Thanks, applied as 0202fa0dd73b5c59a226dc8c500e009387f5f3ae.

Michael

[sent from post-receive hook]

On Thu, 07 Dec 2023 12:09:54 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://lists.freedesktop.org/archives/mesa-announce/2023-November/000740.html
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20231130084812.8949-1-p.zabel@pengutronix.de>
> [mol: remove obsolete patch]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/mesa-23.1.9/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch b/patches/mesa-23.1.9/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> deleted file mode 100644
> index 1520f47aad45..000000000000
> --- a/patches/mesa-23.1.9/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
> -Date: Fri, 12 May 2023 09:58:26 +0200
> -Subject: [PATCH] llvmpipe: only include old Transform includes when needed
> -
> -This fixes building with recent LLVM where these 2 .h files
> -were removed.
> -
> -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
> -Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980>
> ----
> - src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++----
> - 1 file changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
> -index 24d082398e99..9e0d6a5f6439 100644
> ---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
> -+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
> -@@ -42,14 +42,14 @@
> - 
> - #include <llvm/Config/llvm-config.h>
> - #include <llvm-c/Analysis.h>
> --#include <llvm-c/Transforms/Scalar.h>
> --#if LLVM_VERSION_MAJOR >= 7
> --#include <llvm-c/Transforms/Utils.h>
> --#endif
> - #include <llvm-c/BitWriter.h>
> - #if GALLIVM_USE_NEW_PASS == 1
> - #include <llvm-c/Transforms/PassBuilder.h>
> - #elif GALLIVM_HAVE_CORO == 1
> -+#include <llvm-c/Transforms/Scalar.h>
> -+#if LLVM_VERSION_MAJOR >= 7
> -+#include <llvm-c/Transforms/Utils.h>
> -+#endif
> - #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
> - #include <llvm-c/Transforms/IPO.h>
> - #endif
> diff --git a/patches/mesa-23.1.9/series b/patches/mesa-23.1.9/series
> deleted file mode 100644
> index 1d194235166f..000000000000
> --- a/patches/mesa-23.1.9/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> -# 150d8367a25c25c2af2fae117db1148f  - git-ptx-patches magic
> diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> index 8bf018168bbb..5a26a798077e 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -33,6 +33,7 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Degl=disabled \
>  	-Degl-lib-suffix= \
>  	-Degl-native-platform=auto \
> +	-Denable-glcpp-tests=false \
>  	-Dexecmem=true \
>  	-Dexpat=disabled \
>  	-Dfreedreno-kmds= \
> @@ -58,6 +59,7 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Dglx=disabled \
>  	-Dglx-direct=false \
>  	-Dglx-read-only-text=false \
> +	-Dgpuvis=false \
>  	-Dimagination-srv=false \
>  	-Dinstall-intel-gpu-tests=false \
>  	-Dintel-clc=disabled \
> @@ -69,6 +71,7 @@ HOST_MESALIB_CONF_OPT	:= \
>  	-Dmin-windows-version=8 \
>  	-Dmoltenvk-dir= \
>  	-Domx-libs-path=/usr/lib/dri \
> +	-Dopencl-external-clang-headers=disabled \
>  	-Dopencl-spirv=false \
>  	-Dopengl=true \
>  	-Dosmesa=false \
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index be1aade59362..fbadcef9a528 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -257,11 +257,14 @@ config MESALIB_VULKAN_PANFROST
>  
>  config MESALIB_VULKAN_SWRAST
>  	bool
> -	# needs LLVM
> -	depends on BROKEN
>  	select MESALIB_DRI_SWRAST
>  	prompt "Software Rasterizer"
>  
> +config MESALIB_VULKAN_VIRTIO
> +	bool
> +	select MESALIB_XMLCONFIG
> +	prompt "Virtio-GPU Venus"
> +
>  comment "Vulkan layers"
>  
>  config MESALIB_VULKAN_DEVICE_SELECT
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 77cc3e00abbe..b29180c572cc 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION	:= 23.1.9
> -MESALIB_MD5	:= 85e088185a4b751fcb9d4f1fb1f0028e
> +MESALIB_VERSION	:= 23.3.0
> +MESALIB_MD5	:= 30e60f8c466fee52034f303f1afeece2
>  MESALIB		:= mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX	:= tar.xz
>  MESALIB_URL	:= \
> @@ -111,6 +111,7 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_FREEDRENO)	+= freedreno
>  MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_PANFROST)	+= panfrost
>  endif
>  MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST)		+= swrast
> +MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_VIRTIO)		+= virtio
>  
>  MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y)))
>  
> @@ -182,6 +183,7 @@ MESALIB_CONF_OPT	:= \
>  	-Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
>  	-Dglx-direct=true \
>  	-Dglx-read-only-text=false \
> +	-Dgpuvis=false \
>  	-Dimagination-srv=false \
>  	-Dinstall-intel-gpu-tests=false \
>  	-Dintel-clc=disabled \
> @@ -193,6 +195,7 @@ MESALIB_CONF_OPT	:= \
>  	-Dmin-windows-version=8 \
>  	-Dmoltenvk-dir= \
>  	-Domx-libs-path=/usr/lib/dri \
> +	-Dopencl-external-clang-headers=disabled \
>  	-Dopencl-spirv=false \
>  	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
>  	-Dosmesa=false \