pyrox.dev
Merge pull request #301941 from JohnRTitor/mesa
mesa: 24.0.3 -> 24.0.4
-13
pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch
-13
pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch
···
1
-
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
2
-
index 2e1d9c488e2..7979cad75fa 100644
3
-
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
4
-
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
5
-
@@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry)
6
-
{
7
-
struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry);
8
-
9
-
- return radeon_bo_can_reclaim(NULL, &bo->base);
10
-
+ return radeon_bo_can_reclaim(priv, &bo->base);
11
-
}
12
-
13
-
static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf)
···
+2
-7
pkgs/development/libraries/mesa/default.nix
+2
-7
pkgs/development/libraries/mesa/default.nix
···
81
# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
82
83
let
84
-
version = "24.0.3";
85
-
hash = "sha256-d67JoqN7fTWW6hZAs8xT0LXZs7Uqvtid4H43F+kb/b4=";
86
87
# Release calendar: https://www.mesa3d.org/release-calendar.html
88
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
···
141
142
patches = [
143
./opencl.patch
144
-
145
-
# Backport crash fix for Radeon (legacy) kernel driver
146
-
# see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613
147
-
# FIXME: remove when merged upstream
148
-
./backport-radeon-crash-fix.patch
149
];
150
151
postPatch = ''
···
81
# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
82
83
let
84
+
version = "24.0.4";
85
+
hash = "sha256-kP69MKCYy82X/2Lsw9z1yT129/oxTelEz86BlRunRfA=";
86
87
# Release calendar: https://www.mesa3d.org/release-calendar.html
88
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
···
141
142
patches = [
143
./opencl.patch
144
];
145
146
postPatch = ''