From 87817c92b2b6140c29fb550d79f11f95d56cf66d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Apr 2025 09:17:16 -0400
Subject: [PATCH] mesa-asahi: update to 25.1.0+20250425

---
 srcpkgs/libOSMesa-asahi           |  1 -
 srcpkgs/mesa-asahi/template       | 29 ++++++++---------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/libOSMesa-asahi

diff --git a/srcpkgs/libOSMesa-asahi b/srcpkgs/libOSMesa-asahi
deleted file mode 120000
index 643f3dbeeba..00000000000
--- a/srcpkgs/libOSMesa-asahi
+++ /dev/null
@@ -1 +0,0 @@
-mesa-asahi
\ No newline at end of file
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 51d4392279c..676dcf8dd32 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa-asahi'
 pkgname=mesa-asahi
-version=25.1.0+20250221
+version=25.1.0+20250425
 revision=1
 _llvmver=19
 _mesaver=${version%+*}
@@ -8,14 +8,14 @@ archs="aarch64*"
 build_style=meson
 build_helper="qemu"
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=enabled -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
  -Dgallium-vdpau=enabled -Dgallium-va=enabled
  -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
  -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
+ -Dgallium-rusticl=true -Drust_std=2021"
 hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
  $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
  clang${_llvmver} rust rust-bindgen"
@@ -33,13 +33,13 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=3d8c4ca48b8cc420059968badc45141d68af762f57cac5bdb56a6af6d7ed9369
+checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
 replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
 provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
 shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
 
 # alphabetical order is not good
-subpackages="libgbm-asahi libgbm-asahi-devel libOSMesa-asahi MesaLib-asahi-devel
+subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
  mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
  mesa-asahi-dri"
 
@@ -100,19 +100,9 @@ libgbm-asahi-devel_package() {
 	}
 }
 
-libOSMesa-asahi_package() {
-	short_desc="Mesa Off-Screen interface library"
-	replaces="libOSMesa>=0"
-	provides="libOSMesa-${_mesaver}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/libOSMesa.so.*"
-	}
-}
-
 MesaLib-asahi-devel_package() {
-	depends="mesa-asahi>=${version}_${revision} libOSMesa-asahi>=${version}_${revision}
-	libgbm-asahi-devel>=${version}_${revision}"
-	depends+=" libdrm-devel libglvnd-devel"
+	depends="mesa-asahi>=${version}_${revision}
+	 libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
 	replaces="MesaLib-devel>=0"
 	provides="MesaLib-devel-${_mesaver}_${revision}"
 	short_desc+=" - development files"
@@ -121,7 +111,6 @@ MesaLib-asahi-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/libEGL_mesa.so
 		vmove usr/lib/libGLX_mesa.so
-		vmove usr/lib/libOSMesa.so
 	}
 }
 
@@ -143,8 +132,6 @@ mesa-asahi-opencl_package() {
 	provides="mesa-opencl-${_mesaver}_${revision}"
 	pkg_install() {
 		vmove etc/OpenCL
-		vmove usr/lib/gallium-pipe
-		vmove "usr/lib/libMesaOpenCL.so.*"
 		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 52766c33eac..bd82ecd39e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
  libArcus-python3<=4.13.1_8
  libArcus<=4.13.1_8
  libCharon<=4.13.0_3
+ libOSMesa-asahi<=25.1.0+20250221_1
  libSavitar-devel<=4.13.1_3
  libSavitar-python3<=4.13.1_3
  libSavitar<=4.13.1_3