git: 7797615317fa - 2021Q2 - graphics/mesa-devel: update to 21.1.b.21

[Jan Beich]

The branch 2021Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7797615317fa67782ca2fadab9a4e892ce76ac63

commit 7797615317fa67782ca2fadab9a4e892ce76ac63
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-04-14 21:18:10 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-04-15 00:48:49 +0000

    graphics/mesa-devel: update to 21.1.b.21
    
    Changes:        https://gitlab.freedesktop.org/mesa/mesa/-/compare/3a56f069982...9b71154353d
    (cherry picked from commit 2c60eb9e6d17f0074d8dae16e03de009575d048d)
---
 graphics/mesa-devel/Makefile                   |  4 +--
 graphics/mesa-devel/distinfo                   |  6 ++--
 graphics/mesa-devel/files/patch-libdrm-2.4.104 | 50 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 737dad87bd5e..324759a4e625 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,7 +1,7 @@
 
 PORTNAME=	mesa
-DISTVERSION=	21.0-branchpoint-4390
-DISTVERSIONSUFFIX=	-g51a812bb601
+DISTVERSION=	21.1-branchpoint-21
+DISTVERSIONSUFFIX=	-g9b71154353d
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 9a0574e3db72..14356a8836cc 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1618011926
-SHA256 (mesa3d-mesa-21.0-branchpoint-4390-g51a812bb601_GH0.tar.gz) = 0f2404e6dcf04208314ca42f1be48f7976ad7701729d7c44fd5f1ef8c35c613b
-SIZE (mesa3d-mesa-21.0-branchpoint-4390-g51a812bb601_GH0.tar.gz) = 23300379
+TIMESTAMP = 1618435090
+SHA256 (mesa3d-mesa-21.1-branchpoint-21-g9b71154353d_GH0.tar.gz) = 91986a64beef2893d7856dd0e74b9dc7fa89a4bd6115d734df9841fc7bddde43
+SIZE (mesa3d-mesa-21.1-branchpoint-21-g9b71154353d_GH0.tar.gz) = 23357921
 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109
 SIZE (55822330540d.patch) = 1278
 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b
diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.104 b/graphics/mesa-devel/files/patch-libdrm-2.4.104
new file mode 100644
index 000000000000..5ce23670cb1c
--- /dev/null
+++ b/graphics/mesa-devel/files/patch-libdrm-2.4.104
@@ -0,0 +1,50 @@
+Until https://reviews.freebsd.org/D29734 lands revert
+https://gitlab.freedesktop.org/mesa/mesa/-/commit/2c1e4c4baa81
+https://gitlab.freedesktop.org/mesa/mesa/-/commit/75a725e4c555
+
+meson.build:1480:4: ERROR: Invalid version of dependency, need 'libdrm_amdgpu' ['>=2.4.105'] found '2.4.104'.
+
+../src/amd/common/ac_gpu_info.c:528:11: error: implicit declaration of function 'amdgpu_query_video_caps_info' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+      r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE,
+          ^
+../src/amd/common/ac_gpu_info.c:528:11: note: did you mean 'amdgpu_query_heap_info'?
+/usr/local/include/libdrm/amdgpu.h:1141:5: note: 'amdgpu_query_heap_info' declared here
+int amdgpu_query_heap_info(amdgpu_device_handle dev, uint32_t heap,
+    ^
+
+--- meson.build.orig	2021-04-14 06:35:30 UTC
++++ meson.build
+@@ -1452,7 +1452,7 @@ dep_libdrm_radeon = null_dep
+ dep_libdrm_nouveau = null_dep
+ dep_libdrm_intel = null_dep
+ 
+-_drm_amdgpu_ver = '2.4.105'
++_drm_amdgpu_ver = '2.4.100'
+ _drm_radeon_ver = '2.4.71'
+ _drm_nouveau_ver = '2.4.102'
+ _drm_intel_ver = '2.4.75'
+--- src/amd/common/ac_gpu_info.c.orig	2021-04-14 06:35:30 UTC
++++ src/amd/common/ac_gpu_info.c
+@@ -524,22 +524,6 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct rad
+    info->gart_size_kb = DIV_ROUND_UP(info->gart_size, 1024);
+    info->vram_size_kb = DIV_ROUND_UP(info->vram_size, 1024);
+ 
+-   if (info->drm_minor >= 41) {
+-      r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE,
+-            sizeof(info->dec_caps), &(info->dec_caps));
+-      if (r) {
+-         fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for decode failed.\n");
+-         return r;
+-      }
+-
+-      r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE,
+-            sizeof(info->enc_caps), &(info->enc_caps));
+-      if (r) {
+-         fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for encode failed.\n");
+-         return r;
+-      }
+-   }
+-
+    /* Add some margin of error, though this shouldn't be needed in theory. */
+    info->all_vram_visible = info->vram_size * 0.9 < info->vram_vis_size;
+