git: 609819be061f - main - graphics/mesa-devel: update to 21.4.b.752
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Feb 2022 00:52:55 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=609819be061f578b9c4e0d272bc66e4d70bae265
commit 609819be061f578b9c4e0d272bc66e4d70bae265
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-02-21 14:41:01 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-02-24 00:51:35 +0000
graphics/mesa-devel: update to 21.4.b.752
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/a814a4f9dba...b4bef890ee4
---
graphics/mesa-devel/Makefile | 4 +-
graphics/mesa-devel/distinfo | 6 +-
graphics/mesa-devel/files/patch-libdrm-2.4.109 | 89 ++++++++++++++++++++++++++
graphics/mesa-devel/files/patch-no-inotify | 44 -------------
4 files changed, 94 insertions(+), 49 deletions(-)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 406a28131a81..c7174bdf7870 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mesa
-DISTVERSION= 22.0-branchpoint-599
-DISTVERSIONSUFFIX= -ga814a4f9dba
+DISTVERSION= 22.0-branchpoint-752
+DISTVERSIONSUFFIX= -gb4bef890ee4
CATEGORIES= graphics
PKGNAMESUFFIX= -devel
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 237ce0cf644b..a420af09feb7 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1645283815
-SHA256 (mesa3d-mesa-22.0-branchpoint-599-ga814a4f9dba_GH0.tar.gz) = d5980da0a157f873da0e26503200f6399720e2efbde8f626896747c3a6a733a2
-SIZE (mesa3d-mesa-22.0-branchpoint-599-ga814a4f9dba_GH0.tar.gz) = 23590174
+TIMESTAMP = 1645651522
+SHA256 (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = b2c8da58866ae27270a27607cff8745a60f93d067ed29eeccdeda8a02d16b2c1
+SIZE (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = 23598120
SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5
SIZE (700efacda59c.patch) = 981
SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470
diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.109 b/graphics/mesa-devel/files/patch-libdrm-2.4.109
new file mode 100644
index 000000000000..6d15483322a9
--- /dev/null
+++ b/graphics/mesa-devel/files/patch-libdrm-2.4.109
@@ -0,0 +1,89 @@
+Disable https://gitlab.freedesktop.org/mesa/mesa/-/commit/5cf4f0cc9197
+until graphics/libdrm is updated to 2.4.110 or later.
+
+meson.build:1597:4: ERROR: Invalid version of dependency, need 'libdrm_amdgpu' ['>=2.4.110'] found '2.4.109'.
+
+../src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c:1603:11: error: implicit declaration of function 'amdgpu_cs_ctx_stable_pstate' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+ return amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, amdgpu_pstate, NULL);
+ ^
+
+--- meson.build.orig 2022-02-23 18:31:55 UTC
++++ meson.build
+@@ -1567,7 +1567,7 @@ dep_libdrm_radeon = null_dep
+ dep_libdrm_nouveau = null_dep
+ dep_libdrm_intel = null_dep
+
+-_drm_amdgpu_ver = '2.4.110'
++_drm_amdgpu_ver = '2.4.109'
+ _drm_radeon_ver = '2.4.71'
+ _drm_nouveau_ver = '2.4.102'
+ _drm_intel_ver = '2.4.75'
+--- src/amd/vulkan/radv_radeon_winsys.h.orig 2022-02-23 18:31:55 UTC
++++ src/amd/vulkan/radv_radeon_winsys.h
+@@ -258,7 +258,9 @@ struct radeon_winsys {
+
+ bool (*ctx_wait_idle)(struct radeon_winsys_ctx *ctx, enum ring_type ring_type, int ring_index);
+
++#if 0
+ int (*ctx_set_pstate)(struct radeon_winsys_ctx *ctx, uint32_t pstate);
++#endif
+
+ enum radeon_bo_domain (*cs_domain)(const struct radeon_winsys *ws);
+
+--- src/amd/vulkan/radv_sqtt.c.orig 2022-02-23 18:31:55 UTC
++++ src/amd/vulkan/radv_sqtt.c
+@@ -429,6 +429,7 @@ radv_thread_trace_finish_bo(struct radv_device *device
+ }
+ }
+
++#if 0
+ static int
+ radv_thread_trace_init_pstate(struct radv_device *device)
+ {
+@@ -448,6 +449,7 @@ radv_thread_trace_init_pstate(struct radv_device *devi
+
+ return true;
+ }
++#endif
+
+ bool
+ radv_thread_trace_init(struct radv_device *device)
+@@ -466,8 +468,10 @@ radv_thread_trace_init(struct radv_device *device)
+ if (!radv_thread_trace_init_bo(device))
+ return false;
+
++#if 0
+ if (!radv_thread_trace_init_pstate(device))
+ return false;
++#endif
+
+ list_inithead(&thread_trace_data->rgp_pso_correlation.record);
+ simple_mtx_init(&thread_trace_data->rgp_pso_correlation.lock, mtx_plain);
+--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c.orig 2022-02-23 18:31:55 UTC
++++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+@@ -1576,6 +1576,7 @@ radv_amdgpu_ctx_wait_idle(struct radeon_winsys_ctx *rw
+ return true;
+ }
+
++#if 0
+ static uint32_t
+ radv_to_amdgpu_pstate(enum radeon_ctx_pstate radv_pstate)
+ {
+@@ -1602,6 +1603,7 @@ radv_amdgpu_ctx_set_pstate(struct radeon_winsys_ctx *r
+ uint32_t amdgpu_pstate = radv_to_amdgpu_pstate(pstate);
+ return amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, amdgpu_pstate, NULL);
+ }
++#endif
+
+ static void *
+ radv_amdgpu_cs_alloc_syncobj_chunk(struct radv_winsys_sem_counts *counts, uint32_t queue_syncobj,
+@@ -1830,7 +1832,9 @@ radv_amdgpu_cs_init_functions(struct radv_amdgpu_winsy
+ ws->base.ctx_create = radv_amdgpu_ctx_create;
+ ws->base.ctx_destroy = radv_amdgpu_ctx_destroy;
+ ws->base.ctx_wait_idle = radv_amdgpu_ctx_wait_idle;
++#if 0
+ ws->base.ctx_set_pstate = radv_amdgpu_ctx_set_pstate;
++#endif
+ ws->base.cs_domain = radv_amdgpu_cs_domain;
+ ws->base.cs_create = radv_amdgpu_cs_create;
+ ws->base.cs_destroy = radv_amdgpu_cs_destroy;
diff --git a/graphics/mesa-devel/files/patch-no-inotify b/graphics/mesa-devel/files/patch-no-inotify
deleted file mode 100644
index 0cc54a4db514..000000000000
--- a/graphics/mesa-devel/files/patch-no-inotify
+++ /dev/null
@@ -1,44 +0,0 @@
-Regressed by https://gitlab.freedesktop.org/mesa/mesa/-/commit/c50557d9612a
-
-../src/amd/vulkan/radv_device.c:39:10: fatal error: 'sys/inotify.h' file not found
-#include <sys/inotify.h>
- ^~~~~~~~~~~~~~~
-
---- src/amd/vulkan/radv_device.c.orig 2022-02-18 15:04:48 UTC
-+++ src/amd/vulkan/radv_device.c
-@@ -35,7 +35,7 @@
- #include <sys/sysmacros.h>
- #endif
-
--#ifndef _WIN32
-+#ifdef __linux__
- #include <sys/inotify.h>
- #endif
-
-@@ -2974,7 +2974,7 @@ radv_parse_force_vrs_config_file(const char *config_fi
- return force_vrs;
- }
-
--#ifndef _WIN32
-+#ifdef __linux__
-
- #define BUF_LEN ((10 * (sizeof(struct inotify_event) + NAME_MAX + 1)))
-
-@@ -3020,7 +3020,7 @@ radv_notifier_thread_run(void *data)
- static int
- radv_device_init_notifier(struct radv_device *device)
- {
--#ifdef _WIN32
-+#ifndef __linux__
- return true;
- #else
- struct radv_notifier *notifier = &device->notifier;
-@@ -3053,7 +3053,7 @@ fail_watch:
- static void
- radv_device_finish_notifier(struct radv_device *device)
- {
--#ifndef _WIN32
-+#ifdef __linux__
- struct radv_notifier *notifier = &device->notifier;
-
- if (!notifier->thread)