Merge 47493c5be2 into 42d67345ff

srcpkgs/libglapi

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

srcpkgs/mesa/template

@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=24.3.4
+version=25.0.2
 revision=1
 build_style=meson
 _llvmver=19
@@ -24,7 +24,7 @@ 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
+checksum=adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97
 
 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 libOSMesa"
 
 # 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"
@@ -241,18 +241,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() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
 		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

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