[ptxdist] [PATCH v2 1/2] libdrm: new host recipe

[ptxdist] [PATCH v2 1/2] libdrm: new host recipe

[Philipp Zabel]

Required by host-mesalib to build panfrost tools.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
New in v2.
---
 rules/host-libdrm.in   |  5 +++++
 rules/host-libdrm.make | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 rules/host-libdrm.in
 create mode 100644 rules/host-libdrm.make

diff --git a/rules/host-libdrm.in b/rules/host-libdrm.in
new file mode 100644
index 000000000000..bea3f4fc7cb4
--- /dev/null
+++ b/rules/host-libdrm.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBDRM
+	tristate
+	select HOST_MESON
diff --git a/rules/host-libdrm.make b/rules/host-libdrm.make
new file mode 100644
index 000000000000..6702578b5437
--- /dev/null
+++ b/rules/host-libdrm.make
@@ -0,0 +1,31 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2025 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBDRM) += host-libdrm
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_LIBDRM_CONF_TOOL := meson
+HOST_LIBDRM_CONF_OPT := \
+	$(HOST_MESON_OPT) \
+	$(patsubst %,-D%=disabled,$(LIBDRM_BACKENDSC-y)) \
+	$(patsubst %,-D%=disabled,$(LIBDRM_BACKENDSC-)) \
+	-Dcairo-tests=disabled \
+	-Dfreedreno-kgsl=false \
+	-Dman-pages=disabled \
+	-Dvalgrind=disabled \
+	-Dinstall-test-programs=false \
+	-Dtests=false \
+	-Dudev=false
+
+# vim: syntax=make
-- 
2.39.5

[ptxdist] [PATCH v2 2/2] mesalib: version bump 25.0.6 -> 25.1.1

[Philipp Zabel]

https://docs.mesa3d.org/relnotes/25.1.0.html
https://docs.mesa3d.org/relnotes/25.1.1.html

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: Compile and install panfrost_compile host tool.
---
 rules/host-mesalib.in   |  4 ++++
 rules/host-mesalib.make | 30 ++++++++++++++++++------------
 rules/mesalib.in        |  1 +
 rules/mesalib.make      | 13 ++++++-------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
index b67871353da7..226f58f1c948 100644
--- a/rules/host-mesalib.in
+++ b/rules/host-mesalib.in
@@ -8,6 +8,7 @@ config HOST_MESALIB
 	select HOST_LLVM			if HOST_MESALIB_CLC
 	select HOST_MAKEDEPEND
 	select HOST_MESON
+	select HOST_LIBDRM			if HOST_MESALIB_PANFROST
 	select HOST_SYSTEM_PYTHON3
 	select HOST_SYSTEM_PYTHON3_MAKO
 	select HOST_SYSTEM_PYTHON3_PYYAML
@@ -18,4 +19,7 @@ if HOST_MESALIB
 config HOST_MESALIB_CLC
 	bool
 
+config HOST_MESALIB_PANFROST
+	bool
+
 endif
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index c629c9d12ae1..6abc0f443d92 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -15,6 +15,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib
 # Prepare
 # ----------------------------------------------------------------------------
 
+HOST_MESALIB_TOOLS-y := glsl
+HOST_MESALIB_TOOLS-$(PTXCONF_HOST_MESALIB_PANFROST) += panfrost
+
 HOST_MESALIB_MESON_CROSS_FILE := $(call ptx/get-alternative, config/meson, mesalib-native-file.meson)
 
 HOST_MESALIB_CONF_TOOL	:= meson
@@ -27,6 +30,7 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dandroid-strict=true \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
+	-Dbuild-radv-tests=false \
 	-Dbuild-tests=false \
 	-Dcustom-shader-replacement= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
@@ -37,7 +41,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Degl-lib-suffix= \
 	-Degl-native-platform=auto \
 	-Denable-glcpp-tests=false \
-	-Dexecmem=true \
 	-Dexpat=disabled \
 	-Dfreedreno-kmds= \
 	-Dgallium-d3d10-dll-name=libgallium_d3d10 \
@@ -46,14 +49,11 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dgallium-d3d12-video=disabled \
 	-Dgallium-drivers=softpipe \
 	-Dgallium-extra-hud=false \
-	-Dgallium-nine=false \
-	-Dgallium-opencl=disabled \
 	-Dgallium-rusticl=false \
 	-Dgallium-rusticl-enable-drivers= \
 	-Dgallium-va=disabled \
 	-Dgallium-vdpau=disabled \
 	-Dgallium-wgl-dll-name=libgallium_wgl \
-	-Dgallium-xa=disabled \
 	-Dgbm=disabled \
 	-Dgbm-backends-path= \
 	-Dgles-lib-suffix= \
@@ -71,40 +71,39 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dinstall-intel-clc=false \
 	-Dinstall-intel-gpu-tests=false \
 	-Dinstall-mesa-clc=$(call ptx/truefalse, PTXCONF_HOST_MESALIB_CLC) \
-	-Dinstall-precomp-compiler=false \
+	-Dinstall-precomp-compiler=true \
 	-Dintel-bvh-grl=false \
 	-Dintel-clc=system \
 	-Dintel-elk=true \
 	-Dintel-rt=disabled \
 	-Dlegacy-x11=none \
+	-Dlibgbm-external=false \
 	-Dlibunwind=disabled \
 	-Dllvm=$(call ptx/endis, PTXCONF_HOST_MESALIB_CLC)d \
 	-Dllvm-orcjit=false \
 	-Dlmsensors=disabled \
 	-Dmesa-clc=$(call ptx/ifdef, PTXCONF_HOST_MESALIB_CLC,enabled,auto) \
+	-Dmesa-clc-bundle-headers=enabled \
 	-Dmicrosoft-clc=disabled \
 	-Dmin-windows-version=8 \
 	-Dmoltenvk-dir= \
 	-Dopengl=true \
-	-Dosmesa=false \
 	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms= \
 	-Dpower8=disabled \
-	-Dprecomp-compiler=system \
+	-Dprecomp-compiler=enabled \
 	-Dradv-build-id='' \
-	-Dselinux=false \
 	-Dshader-cache=disabled \
 	-Dshader-cache-default=true \
 	-Dshader-cache-max-size=1G \
-	-Dshared-glapi=enabled \
 	-Dshared-llvm=disabled \
 	-Dspirv-to-dxil=false \
 	-Dsplit-debug=disabled \
 	-Dsse2=true \
 	-Dstatic-libclc=[] \
 	-Dteflon=false \
-	-Dtools=glsl \
+	-Dtools=$(subst $(space),$(comma),$(HOST_MESALIB_TOOLS-y)) \
 	-Dunversion-libgallium=false \
 	-Dva-libs-path=/usr/lib/dri \
 	-Dvalgrind=disabled \
@@ -127,7 +126,11 @@ HOST_MESALIB_MAKE_OPT	:= \
 ifdef PTXCONF_HOST_MESALIB_CLC
 HOST_MESALIB_MAKE_OPT	+= \
 	src/compiler/clc/mesa_clc \
-	src/compiler/spirv/vtn_bindgen
+	src/compiler/spirv/vtn_bindgen2
+endif
+ifdef PTXCONF_HOST_MESALIB_PANFROST
+HOST_MESALIB_MAKE_OPT	+= \
+	src/panfrost/clc/panfrost_compile
 endif
 
 $(STATEDIR)/host-mesalib.install:
@@ -135,7 +138,10 @@ $(STATEDIR)/host-mesalib.install:
 	install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/usr/bin/mesa/glsl_compiler
 ifdef PTXCONF_HOST_MESALIB_CLC
 	install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/clc/mesa_clc $(HOST_MESALIB_PKGDIR)/usr/bin/mesa_clc
-	install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/spirv/vtn_bindgen $(HOST_MESALIB_PKGDIR)/usr/bin/vtn_bindgen
+	install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/spirv/vtn_bindgen2 $(HOST_MESALIB_PKGDIR)/usr/bin/vtn_bindgen2
+endif
+ifdef PTXCONF_HOST_MESALIB_PANFROST
+	install -D -m755 $(HOST_MESALIB_DIR)-build/src/panfrost/clc/panfrost_compile $(HOST_MESALIB_PKGDIR)/usr/bin/panfrost_compile
 endif
 	@$(call touch)
 
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 2b902e1f4b9f..c0fb5e8fdaa3 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -5,6 +5,7 @@ menuconfig MESALIB
 	prompt "mesa                          "
 	select HOST_MESALIB
 	select HOST_MESALIB_CLC		if MESALIB_CLC
+	select HOST_MESALIB_PANFROST	if MESALIB_DRI_PANFROST || MESALIB_VULKAN_PANFROST
 	select HOST_MESON
 	select HOST_MAKEDEPEND
 	select HOST_SYSTEM_PYTHON3
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 760d45304864..d727d7a80bc8 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 25.0.6
-MESALIB_MD5	:= 2f945b8f2c8103a196d63413104daf01
+MESALIB_VERSION	:= 25.1.1
+MESALIB_MD5	:= 3371abecb611ec835c4fe5d5ba7f4b00
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
 MESALIB_URL	:= \
@@ -172,10 +172,12 @@ MESALIB_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
 	-Dallow-kcmp=enabled \
 	-Damd-use-llvm=true \
+	-Damdgpu-virtio=false \
 	-Dandroid-libbacktrace=disabled \
 	-Dandroid-strict=true \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
+	-Dbuild-radv-tests=false \
 	-Dbuild-tests=false \
 	-Dcustom-shader-replacement= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
@@ -194,14 +196,11 @@ MESALIB_CONF_OPT	:= \
 	-Dgallium-d3d12-video=disabled \
 	-Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
 	-Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \
-	-Dgallium-nine=false \
-	-Dgallium-opencl=disabled \
 	-Dgallium-rusticl=false \
 	-Dgallium-rusticl-enable-drivers= \
 	-Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \
 	-Dgallium-vdpau=disabled \
 	-Dgallium-wgl-dll-name=libgallium_wgl \
-	-Dgallium-xa=disabled \
 	-Dgbm=$(call ptx/endis, PTXCONF_MESALIB_GBM)d \
 	-Dgbm-backends-path= \
 	-Dgles-lib-suffix= \
@@ -225,16 +224,17 @@ MESALIB_CONF_OPT	:= \
 	-Dintel-elk=true \
 	-Dintel-rt=disabled \
 	-Dlegacy-x11=none \
+	-Dlibgbm-external=false \
 	-Dlibunwind=disabled \
 	-Dllvm=$(call ptx/endis, PTXCONF_MESALIB_LLVM)d \
 	-Dllvm-orcjit=false \
 	-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
 	-Dmesa-clc=$(call ptx/ifdef, PTXCONF_MESALIB_CLC,system,auto) \
+	-Dmesa-clc-bundle-headers=enabled \
 	-Dmicrosoft-clc=disabled \
 	-Dmin-windows-version=8 \
 	-Dmoltenvk-dir= \
 	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
-	-Dosmesa=false \
 	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
@@ -244,7 +244,6 @@ MESALIB_CONF_OPT	:= \
 	-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d \
 	-Dshader-cache-default=true \
 	-Dshader-cache-max-size=1G \
-	-Dshared-glapi=enabled \
 	-Dshared-llvm=enabled \
 	-Dspirv-to-dxil=false \
 	-Dsplit-debug=disabled \
-- 
2.39.5