Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jul 2021 00:14:03 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 2bc237330f10 - 2021Q3 - graphics/mesa-devel: update to 21.1.b.3934
Message-ID:  <202107060014.1660E3he029160@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2bc237330f109d3fc95be958eb8eecc52cfb95e2

commit 2bc237330f109d3fc95be958eb8eecc52cfb95e2
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-07-03 13:23:29 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-07-06 00:13:06 +0000

    graphics/mesa-devel: update to 21.1.b.3934
    
    Changes:        https://gitlab.freedesktop.org/mesa/mesa/-/compare/c246af0dd80...e2e9dd44f42
    (cherry picked from commit d17122bb82e0c38cff2f6d417110f2bf9f2c1aed)
---
 graphics/mesa-devel/Makefile                   |  4 ++--
 graphics/mesa-devel/distinfo                   |  6 ++---
 graphics/mesa-devel/files/patch-libdrm-2.4.105 | 31 ++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 33f69875c331..c841770b628b 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	21.1-branchpoint-3838
-DISTVERSIONSUFFIX=	-gc246af0dd80
+DISTVERSION=	21.1-branchpoint-3934
+DISTVERSIONSUFFIX=	-ge2e9dd44f42
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 171ebeee45e2..a90315f5ca30 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1625318609
-SHA256 (mesa3d-mesa-21.1-branchpoint-3838-gc246af0dd80_GH0.tar.gz) = a2ce8a5bc1c512a65a46a08f2dc37ab7336b1b1e540f5165136fdff79289cca3
-SIZE (mesa3d-mesa-21.1-branchpoint-3838-gc246af0dd80_GH0.tar.gz) = 24312682
+TIMESTAMP = 1625524453
+SHA256 (mesa3d-mesa-21.1-branchpoint-3934-ge2e9dd44f42_GH0.tar.gz) = c50736428e525bfac331b488c22457d311370179af6d071e4dac3fc320ad960b
+SIZE (mesa3d-mesa-21.1-branchpoint-3934-ge2e9dd44f42_GH0.tar.gz) = 24323856
 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109
 SIZE (55822330540d.patch) = 1278
 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b
diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.105 b/graphics/mesa-devel/files/patch-libdrm-2.4.105
new file mode 100644
index 000000000000..a07bacf70989
--- /dev/null
+++ b/graphics/mesa-devel/files/patch-libdrm-2.4.105
@@ -0,0 +1,31 @@
+Drop after https://reviews.freebsd.org/D31003 lands
+
+meson.build:1521:4: ERROR: Invalid version of dependency, need 'libdrm_amdgpu' ['>=2.4.107'] found '2.4.106'.
+
+../src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c:427:64: error: use of undeclared identifier 'AMDGPU_VA_RANGE_REPLAYABLE'
+                             (flags & RADEON_FLAG_REPLAYABLE ? AMDGPU_VA_RANGE_REPLAYABLE : 0);
+                                                               ^
+
+--- 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.107'
++_drm_amdgpu_ver = '2.4.105'
+ _drm_radeon_ver = '2.4.71'
+ _drm_nouveau_ver = '2.4.102'
+ _drm_intel_ver = '2.4.75'
+--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c.orig	2021-07-05 19:49:32 UTC
++++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
+@@ -424,6 +424,9 @@ radv_amdgpu_winsys_bo_create(struct radeon_winsys *_ws
+ 
+    const uint64_t va_flags = AMDGPU_VA_RANGE_HIGH |
+                              (flags & RADEON_FLAG_32BIT ? AMDGPU_VA_RANGE_32_BIT : 0) |
++#ifndef AMDGPU_VA_RANGE_REPLAYABLE
++#define AMDGPU_VA_RANGE_REPLAYABLE     0x4
++#endif
+                              (flags & RADEON_FLAG_REPLAYABLE ? AMDGPU_VA_RANGE_REPLAYABLE : 0);
+    r = amdgpu_va_range_alloc(ws->dev, amdgpu_gpu_va_range_general, size, virt_alignment, replay_address,
+                              &va, &va_handle, va_flags);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107060014.1660E3he029160>