From owner-dev-commits-ports-main@freebsd.org Sun Jul 25 16:17:09 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 270F765C0DC; Sun, 25 Jul 2021 16:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GXp9K0Z2Mz3Fjc; Sun, 25 Jul 2021 16:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE89026A3D; Sun, 25 Jul 2021 16:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16PGH8WJ081495; Sun, 25 Jul 2021 16:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16PGH8W5081494; Sun, 25 Jul 2021 16:17:08 GMT (envelope-from git) Date: Sun, 25 Jul 2021 16:17:08 GMT Message-Id: <202107251617.16PGH8W5081494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 72ee2b3b1c39 - main - graphics/mesa-devel: drop libdrm < 2.4.107 workaround after 1c02555442ed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ee2b3b1c393604e7e159ba43aeba44a13df5e7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 16:17:09 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=72ee2b3b1c393604e7e159ba43aeba44a13df5e7 commit 72ee2b3b1c393604e7e159ba43aeba44a13df5e7 Author: Jan Beich AuthorDate: 2021-07-25 16:07:44 +0000 Commit: Jan Beich CommitDate: 2021-07-25 16:17:03 +0000 graphics/mesa-devel: drop libdrm < 2.4.107 workaround after 1c02555442ed --- graphics/mesa-devel/files/patch-libdrm-2.4.105 | 31 -------------------------- 1 file changed, 31 deletions(-) diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.105 b/graphics/mesa-devel/files/patch-libdrm-2.4.105 deleted file mode 100644 index a07bacf70989..000000000000 --- a/graphics/mesa-devel/files/patch-libdrm-2.4.105 +++ /dev/null @@ -1,31 +0,0 @@ -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);