From 209d70c04f277ebb090b0b9ceb85fbe6d933f60b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 25 Nov 2024 04:13:29 -0600
Subject: user/mesa: Update to 24.3.0, simplify packaging

There is no reason to split EGL since all DRI drivers need the EGL
runtime now due to how glvnd works.  Similar for GL-API.

Confirmed working well on:

* Intel HD Graphics 3000/4000 (Sandy Bridge, Ivy Bridge)
* NVIDIA Fermi (GeForce GT 520, Quadro 1000M)
* AMD Radeon (r600 on ppc64, with usual known brokenness)
* LLVMpipe on Intel Iris (Raptor Lake)

in both X11 and Wayland environments.
---
 user/mesa/APKBUILD | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'user/mesa')

diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index d45468a6c..9c20d466e 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mesa
-pkgver=24.2.7
+pkgver=24.3.0
 _llvmver=18
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
@@ -16,10 +16,10 @@ makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev libglvnd-dev
 	libxv-dev libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend meson
 	ninja python3 py3-libxml2 py3-mako py3-pygments py3-markupsafe
 	py3-pyyaml rust wayland-dev wayland-protocols glslang-dev
-	zlib-dev zstd-dev bindgen-cli cbindgen"
-subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-egl
-	$pkgname-glapi $pkgname-gbm $pkgname-d3d $pkgname-xatracker
-	$pkgname-osmesa"
+	zlib-dev zstd-dev bindgen-cli cbindgen clang-dev"
+replaces="mesa-egl mesa-gl mesa-glapi mesa-gles"
+subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-gbm
+	$pkgname-d3d $pkgname-xatracker $pkgname-osmesa"
 source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
@@ -88,22 +88,6 @@ package() {
 	DESTDIR="$pkgdir" ninja -C build install
 }
 
-egl() {
-	replaces="mesa"
-	pkgdesc="Mesa libEGL runtime libraries"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libEGL*.so* \
-		"$subpkgdir"/usr/lib/
-}
-
-glapi() {
-	replaces="$pkgname-gles"
-	pkgdesc="Mesa OpenGL API"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libglapi.so.* \
-		"$subpkgdir"/usr/lib/
-}
-
 d3d() {
 	replaces="mesa"
 	pkgdesc="Mesa Direct3D adaptor libraries"
@@ -166,4 +150,4 @@ dri() {
 	mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/
 }
 
-sha512sums="8776b45abe5e845c587c0fa9feb22d89f07457265ff63175fb42681ce56dff97b0e163d9e9ac80555ee04decb78754e7331e1015d95c5f84ca3c2549663291dd  mesa-24.2.7.tar.xz"
+sha512sums="20168ae4c278776a60d5febf53b3367cf08bffffb40ef2054821e68d7a8c37a07871d097ab17555f41a4fe716f0de7df95ad7d452b1ed57db6527838eb839ba4  mesa-24.3.0.tar.xz"
-- 
cgit v1.2.3-70-g09d2