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

Signed-off-by: Philipp Zabel <[email protected]>
---
 rules/host-mesalib.make | 14 +++++---------
 rules/mesalib.make      | 13 ++++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index c629c9d12ae1..82c4db039ab4 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -27,6 +27,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 +38,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 +46,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= \
@@ -77,27 +74,26 @@ HOST_MESALIB_CONF_OPT       := \
        -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 \
        -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 \
@@ -127,7 +123,7 @@ 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
 
 $(STATEDIR)/host-mesalib.install:
@@ -135,7 +131,7 @@ $(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
        @$(call touch)
 
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


Reply via email to