Re: [PR PATCH] [Updated] mesa: update to version 23.2.1.

[SpidFightFR <SpidFightFR@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-mesa-23.1.8
https://github.com/void-linux/void-packages/pull/46172

mesa: update to version 23.2.1.

#### Testing the changes
- I tested the changes in this PR: **briefly**



#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)

Hey lads, this time again for a PR, with the 23.1.8 version.
I'll be testing this PR in a moment on my laptop, as issues happened in the past 2 PRs.


A patch file from https://github.com/void-linux/void-packages/pull/46172.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-23.1.8-46172.patch --]
[-- Type: text/x-diff, Size: 2793 bytes --]

From 77e7cab7ee3cb4ac769dd30cd9123a7a48649e16 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Wed, 1 Nov 2023 16:24:05 +0000
Subject: [PATCH] mesa: update to version 23.2.1.

---
 srcpkgs/mesa/patches/fix-meson-build.patch | 28 ++++++++++++++++++++++
 srcpkgs/mesa/template                      |  7 ++----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch

diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
new file mode 100644
index 0000000000000..01d203366000c
--- /dev/null
+++ b/srcpkgs/mesa/patches/fix-meson-build.patch
@@ -0,0 +1,28 @@
+diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
+index 4bde074..41df740 100644
+--- a/src/gallium/frontends/rusticl/meson.build
++++ b/src/gallium/frontends/rusticl/meson.build
+@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
+   'rusticl_proc_macros',
+   [rusticl_proc_macros_files],
+   rust_crate_type : 'proc-macro',
++  native: true,
+   rust_args : [
+     rusticl_args,
+   ],
+@@ -353,6 +354,7 @@ librusticl = static_library(
+   gnu_symbol_visibility : 'hidden',
+   rust_crate_type : 'staticlib',
+   rust_args : [
++    '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
+     rusticl_args,
+   ],
+   link_with : [
+@@ -360,7 +362,6 @@ librusticl = static_library(
+     libmesa_rust_gen,
+     libmesa_rust_util,
+     rusticl_opencl_gen,
+-    rusticl_proc_macros,
+   ],
+   dependencies : [
+     idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index df788fe3b0f00..ce36abfc77026 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.1.3
+version=23.2.1
 revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -23,7 +23,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=2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9
+checksum=64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc
 
 build_options="wayland"
 build_options_default="wayland"
@@ -187,9 +187,6 @@ post_configure() {
 		find -iname "*.ninja" -exec sed -i "{}" \
 			-e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
 			-e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
-			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
-			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
-			-e "s;-isystem;-I${XBPS_CROSS_BASE};g" \
 			\;
 	fi
 }