mesa: update to version 24.0.2.

This commit is contained in:
SpidFightFR 2024-03-09 15:53:33 +01:00 committed by John Zimmermann
parent 2677a09e6d
commit 47691bbd17
3 changed files with 18 additions and 32 deletions

View file

@ -1,28 +0,0 @@
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,

View file

@ -0,0 +1,13 @@
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 2e1d9c4..7979cad 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry)
{
struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry);
- return radeon_bo_can_reclaim(NULL, &bo->base);
+ return radeon_bo_can_reclaim(priv, &bo->base);
}
static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf)

View file

@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
version=23.3.5
revision=3
version=24.0.2
revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@ -24,7 +24,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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
checksum=94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8
build_options="wayland"
build_options_default="wayland"
@ -188,7 +188,8 @@ post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
-e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
\;
-e "s|-isystem/usr/include||g" \
\;
fi
}