From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Dec 2023 12:10:22 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rBCGs-006uFg-08 for lore@lore.pengutronix.de; Thu, 07 Dec 2023 12:10:22 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rBCGs-0003JX-BZ; Thu, 07 Dec 2023 12:10:22 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rBCGR-0002qr-46; Thu, 07 Dec 2023 12:09:55 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rBCGQ-00EAVq-O3; Thu, 07 Dec 2023 12:09:54 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rBCGQ-005Zfk-2G; Thu, 07 Dec 2023 12:09:54 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 7 Dec 2023 12:09:54 +0100 Message-Id: <20231207110954.1328757-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231130084812.8949-1-p.zabel@pengutronix.de> References: <20231130084812.8949-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] mesalib: version bump 23.1.9 -> 23.3.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 0202fa0dd73b5c59a226dc8c500e009387f5f3ae. Michael [sent from post-receive hook] On Thu, 07 Dec 2023 12:09:54 +0100, Philipp Zabel wrote: > https://lists.freedesktop.org/archives/mesa-announce/2023-November/000740.html > > Signed-off-by: Philipp Zabel > Message-Id: <20231130084812.8949-1-p.zabel@pengutronix.de> > [mol: remove obsolete patch] > Signed-off-by: Michael Olbrich > > 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 > -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 > -Part-of: > ---- > - 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 > - #include > --#include > --#if LLVM_VERSION_MAJOR >= 7 > --#include > --#endif > - #include > - #if GALLIVM_USE_NEW_PASS == 1 > - #include > - #elif GALLIVM_HAVE_CORO == 1 > -+#include > -+#if LLVM_VERSION_MAJOR >= 7 > -+#include > -+#endif > - #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > - #include > - #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 \