mesa: update to 25.1.3

- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper

srcpkgs/libglapi

@@ -1 +0,0 @@
-mesa

srcpkgs/mesa/template

@@ -1,16 +1,16 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
 build_style=meson
 _llvmver=19
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser  python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
 makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
 
 build_helper="qemu"
 build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
 
 # Replace old mesa pkgs, superseded by libglvnd.
 replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # Check for correctness on major mesa version updates
 # Particularly, check if any new worthwhile drivers were added
 
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
 _vulkan_drivers=" -Dvulkan-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
 if [ "$_have_llvmpipe" ]; then
 	subpackages+=" mesa-vulkan-lavapipe"
 	_vulkan_drivers+=",swrast"
+	# note: swrast IS valid for vulkan drivers still, not gallium
 else
 	configure_args+=" -Ddraw-use-llvm=false"
 fi
@@ -119,8 +120,9 @@ fi
 
 if [ "$_have_arm" ]; then
 	_have_vulkan=yes
-	_gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
-	_vulkan_drivers+=",broadcom,freedreno"
+	_have_opencl=yes
+	_gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+	_vulkan_drivers+=",broadcom,freedreno,asahi"
 	subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
 	# transitional dummy packages
 	subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
 	}
 }
 
-libglapi_package() {
-	# this dependency is wrong, it was added as a hack to allow updating
-	# systems with libglapi-32bit after the switch to glvnd
-	# see 927f17347f9c646047c65312c8e8ce1ad88b7832
-	# it can be removed when glibc multilib (with *-32bit packages) is removed
-	depends="libglvnd"
-	short_desc="Free implementation of the GL API - shared library"
-	pkg_install() {
-		vmove "usr/lib/libglapi.so.*"
-	}
-}
-
 libgbm_package() {
 	short_desc="Mesa Generic buffer management API - runtime"
 	pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
 	}
 }
 
-libOSMesa_package() {
-	short_desc="Mesa Off-Screen interface library"
-	pkg_install() {
-		vmove "usr/lib/libOSMesa.so.*"
-	}
-}
-
 MesaLib-devel_package() {
-	depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
-	 libgbm-devel>=${version}_${revision}"
+	depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
 	if [ "$_have_vmware" ]; then
 		depends+=" libxatracker>=${version}_${revision}"
 	fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/libEGL_mesa.so
 		vmove usr/lib/libGLX_mesa.so
-		vmove usr/lib/libOSMesa.so
-		vmove usr/lib/libglapi.so
 		if [ "$_have_vmware" ]; then
 			vmove usr/lib/libxatracker.so
 		fi

srcpkgs/removed-packages/template

@@ -405,6 +405,7 @@ replaces="
  libglade<=2.6.4_12
  libglademm-devel<=2.6.7_6
  libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
  libglib-static<=2.58.3_5
  libgnome-keyring-devel<=3.12.0_5
  libgnome-keyring<=3.12.0_5