mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] mesalib: version bump 23.0.0 -> 23.1.0
@ 2023-05-11  8:28 Philipp Zabel
  2023-05-17 16:14 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2023-05-11  8:28 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Enable a gallium driver (swrast) in host-mesalib to keep the build
system from deactivating the glsl_compiler target. Add an option to
build the Intel hasvk Vulkan driver for gfx7/8 platforms.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-mesalib.make | 10 +++++-----
 rules/mesalib.in        |  5 +++++
 rules/mesalib.make      | 13 +++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index adcd227d8e23..3412cdb3db11 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -18,6 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib
 HOST_MESALIB_CONF_TOOL	:= meson
 HOST_MESALIB_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
+	-Dallow-kcmp=enabled \
+	-Dandroid-libbacktrace=disabled \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
 	-Dbuild-tests=false \
@@ -25,7 +27,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
 	-Ddatasources=auto \
 	-Ddraw-use-llvm=false \
-	-Ddri-drivers= \
 	-Ddri-drivers-path=/usr/lib/dri \
 	-Ddri-search-path=/usr/lib/dri \
 	-Ddri3=disabled \
@@ -33,11 +34,10 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Degl-lib-suffix= \
 	-Degl-native-platform=auto \
 	-Dexecmem=true \
-	-Dfreedreno-kgsl=false \
-	-Dfreedreno-virtio=false \
+	-Dfreedreno-kmds= \
 	-Dgallium-d3d10umd=false \
 	-Dgallium-d3d12-video=disabled \
-	-Dgallium-drivers= \
+	-Dgallium-drivers=swrast \
 	-Dgallium-extra-hud=false \
 	-Dgallium-nine=false \
 	-Dgallium-omx=disabled \
@@ -60,6 +60,7 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dimagination-srv=false \
 	-Dinstall-intel-gpu-tests=false \
 	-Dintel-clc=disabled \
+	-Dintel-xe-kmd=disabled \
 	-Dlibunwind=disabled \
 	-Dllvm=disabled \
 	-Dlmsensors=disabled \
@@ -70,7 +71,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dopencl-spirv=false \
 	-Dopengl=true \
 	-Dosmesa=false \
-	-Dosmesa-bits=unspecified \
 	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms= \
diff --git a/rules/mesalib.in b/rules/mesalib.in
index cf9619c85241..6f68c3ceebf5 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -237,6 +237,11 @@ config MESALIB_VULKAN_INTEL
 	select MESALIB_XMLCONFIG
 	prompt "Intel (Anvil)"
 
+config MESALIB_VULKAN_INTEL_HASVK
+	bool
+	select MESALIB_XMLCONFIG
+	prompt "Intel (hasvk)"
+
 config MESALIB_VULKAN_FREEDRENO
 	bool
 	prompt "Freedreno (Turnip)"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index f918a4ffc316..379e169a0660 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 23.0.2
-MESALIB_MD5	:= ffea65f5dd7f1be1e4f941ad990a3ae7
+MESALIB_VERSION	:= 23.1.0
+MESALIB_MD5	:= 786ef9e01490654da0d4deb0f7a75700
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
 MESALIB_URL	:= \
@@ -101,6 +101,7 @@ MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC)	+= h265enc
 ifdef PTXCONF_ARCH_X86
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD)		+= amd
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL)		+= intel
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL_HASVK)	+= intel_hasvk
 endif
 ifdef PTXCONF_ARCH_ARM_NEON
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM)	+= broadcom
@@ -138,6 +139,8 @@ endif
 MESALIB_CONF_TOOL	:= meson
 MESALIB_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
+	-Dallow-kcmp=enabled \
+	-Dandroid-libbacktrace=disabled \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
 	-Dbuild-tests=false \
@@ -145,7 +148,6 @@ MESALIB_CONF_OPT	:= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
 	-Ddatasources=auto \
 	-Ddraw-use-llvm=true \
-	-Ddri-drivers=[] \
 	-Ddri-drivers-path=/usr/lib/dri \
 	-Ddri-search-path=/usr/lib/dri \
 	-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
@@ -154,8 +156,7 @@ MESALIB_CONF_OPT	:= \
 	-Degl-native-platform=auto \
 	-Denable-glcpp-tests=false \
 	-Dexecmem=true \
-	-Dfreedreno-kgsl=false \
-	-Dfreedreno-virtio=false \
+	-Dfreedreno-kmds=msm \
 	-Dgallium-d3d10umd=false \
 	-Dgallium-d3d12-video=disabled \
 	-Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
@@ -181,6 +182,7 @@ MESALIB_CONF_OPT	:= \
 	-Dimagination-srv=false \
 	-Dinstall-intel-gpu-tests=false \
 	-Dintel-clc=disabled \
+	-Dintel-xe-kmd=disabled \
 	-Dlibunwind=disabled \
 	-Dllvm=disabled \
 	-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
@@ -191,7 +193,6 @@ MESALIB_CONF_OPT	:= \
 	-Dopencl-spirv=false \
 	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
 	-Dosmesa=false \
-	-Dosmesa-bits=unspecified \
 	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
-- 
2.39.2




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-17 16:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-11  8:28 [ptxdist] [PATCH] mesalib: version bump 23.0.0 -> 23.1.0 Philipp Zabel
2023-05-17 16:14 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox