From 1dafa6f1ba8746e4932de94c9ccb8e9cdc8e1d8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 28 Sep 2024 22:37:41 -0700
Subject: [PATCH] mesa: fix dependency cycle due to reorganization of library
 dependencies

---
 srcpkgs/mesa-libgallium |  1 +
 srcpkgs/mesa/template   | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/mesa-libgallium

diff --git a/srcpkgs/mesa-libgallium b/srcpkgs/mesa-libgallium
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-libgallium
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e7fab04f92f..38ff86cc4d1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=24.2.3
-revision=1
+revision=2
 build_style=meson
 _llvmver=18
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -38,7 +38,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libglapi 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"
@@ -224,6 +224,13 @@ post_install() {
 	done
 }
 
+mesa-libgallium_package() {
+	short_desc="Mesa internal shared platform for building graphics drivers"
+	pkg_install() {
+		vmove "usr/lib/libgallium-*.so"
+	}
+}
+
 libglapi_package() {
 	# this dependency is wrong, it was added as a hack to allow updating
 	# systems with libglapi-32bit after the switch to glvnd