apply patch from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29275

3 files changed, 51 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70553a21caf1..443ba8dd3f4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-minimal-git
 	pkgdesc = an open-source implementation of the OpenGL specification, stripped down git version
-	pkgver = 24.2.0_devel.189258.5502ecd7716
+	pkgver = 24.2.0_devel.189613.18c736bcfc5
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -58,10 +58,13 @@ pkgbase = mesa-minimal-git
 	options = !debug
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git
 	source = LICENSE
+	source = 29275.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = af51dce4950cdeacc5ddea2fd1685a6e
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = 81a368f7e44841c1b24f9a25d528bad07293855cce439d9a4790d12c1cfb363b84674fabf2bd56049ed07d43701e5c0d251fdade697388a50c785983147b3feb
 
 pkgname = mesa-minimal-git
 	depends = libdrm
@@ -93,7 +96,7 @@ pkgname = opencl-rusticl-mesa-minimal-git
 	depends = spirv-llvm-translator-minimal-git
 	depends = libclc-minimal-git
 	depends = spirv-tools-git
-	depends = mesa-minimal-git=24.2.0_devel.189258.5502ecd7716-1
+	depends = mesa-minimal-git=24.2.0_devel.189613.18c736bcfc5-1
 	depends = llvm-libs-minimal-git
 	depends = clang-libs-minimal-git
 	depends = expat
diff --git a/29275.patch b/29275.patch
new file mode 100644
index 000000000000..5bf357b7c47c
--- /dev/null
+++ b/29275.patch
@@ -0,0 +1,33 @@
+From 34fa84a06de74cfde95faf3e4a0d30922d08601d Mon Sep 17 00:00:00 2001
+From: Karol Herbst <kherbst@redhat.com>
+Date: Fri, 17 May 2024 23:25:12 +0200
+Subject: [PATCH] rusticl/meson: add build root dir to the include dirs of
+ rusticl_c
+
+The static inline wrapper includes the header file relatively from where
+`bindgen` gets executed, or so it seems.
+
+I'm sure we can come up with a better solution, but this unbreaks builds.
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11178
+Fixes: 53629b0a2d4 ("rusticl: make use of new `output_inline_wrapper` meson.rust.bindgen feature")
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29275>
+---
+ src/gallium/frontends/rusticl/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
+index 39b2089fcfc9d..0663a2b6c59a0 100644
+--- a/src/gallium/frontends/rusticl/meson.build
++++ b/src/gallium/frontends/rusticl/meson.build
+@@ -347,6 +347,7 @@ rusticl_c = static_library(
+   ],
+   gnu_symbol_visibility : 'hidden',
+   include_directories : [
++    meson.build_root(),
+     inc_gallium,
+     inc_gallium_aux,
+     inc_include,
+-- 
+GitLab
+
diff --git a/PKGBUILD b/PKGBUILD
index fbdb4cb83d8b..b47aaee13742 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=mesa-minimal-git
 pkgname=(mesa-minimal-git opencl-rusticl-mesa-minimal-git)
 pkgdesc="an open-source implementation of the OpenGL specification, stripped down git version"
-pkgver=24.2.0_devel.189258.5502ecd7716
+pkgver=24.2.0_devel.189613.18c736bcfc5
 pkgrel=1
 arch=('x86_64')
 makedepends=(git meson ninja libglvnd python-packaging python-mako xorgproto libxml2 libx11  libva elfutils libxrandr
@@ -29,11 +29,15 @@ url="https://www.mesa3d.org"
 license=('custom')
 source=("mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git"
                 'LICENSE'
+                '29275.patch'
 )
+
 md5sums=('SKIP'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         'af51dce4950cdeacc5ddea2fd1685a6e')
 sha512sums=('SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            '81a368f7e44841c1b24f9a25d528bad07293855cce439d9a4790d12c1cfb363b84674fabf2bd56049ed07d43701e5c0d251fdade697388a50c785983147b3feb')
 options=(!emptydirs !lto !debug)
 
 
@@ -42,6 +46,12 @@ options=(!emptydirs !lto !debug)
 # The responsibility to validate the value of NINJAFLAGS lies with the user.
 # If unsure, use NINJAFLAGS=""
 
+prepare() {
+    # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29275
+    patch --directory=mesa --forward --strip=1 --input="$srcdir"/29275.patch
+
+}
+
 pkgver() {
     cd mesa
     local _ver