From nobody Tue Mar 15 00:34:39 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F2E241A15492; Tue, 15 Mar 2022 00:34:39 +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 4KHZDH62bcz4YHs; Tue, 15 Mar 2022 00:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647304479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aG8NS2cnvczTD2POW85EGdhDWi0I+Bjqjn0hpXn8fKY=; b=Rmx/1CA6PvDRPlaCGg+RFxvJ7b0iQaNcdk+7lERGYr6oAgiEjzRexiYFdae/6w+goqkKVe e4olXIM5zAzg9cHAosQ6AzUbOUIQJlFtqtOC2ihlm3pfXRVWQB0nFKq0/jk5LqDM2IOoPr 22qhH8qL5Bgvo7XQoExSOEEcdtdCSL/kbGeDcBqtFnylPWhHeJeASfV8NwEwsv4Er9Ex9K CHBRzfd59NZyUDXawuSnfDOlsQg3becoR+Fsd7WDpktquMynQ6D5ruODoywpzoeXElldtB K7G7+dB+eeg6AwMAFhUF7KDWjj8D/fSpW/5j2F28eo+LGcTsBnHn2+MTSrOkOw== 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 B0838174DB; Tue, 15 Mar 2022 00:34:39 +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 22F0Yd85045874; Tue, 15 Mar 2022 00:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22F0YdTb045873; Tue, 15 Mar 2022 00:34:39 GMT (envelope-from git) Date: Tue, 15 Mar 2022 00:34:39 GMT Message-Id: <202203150034.22F0YdTb045873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: d728011ee12e - 2022Q1 - graphics/mesa-devel: drop libdrm < 2.4.10 workaround after 0066fe2abf13 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: d728011ee12e68935864cac4d670e2203d904306 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647304479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aG8NS2cnvczTD2POW85EGdhDWi0I+Bjqjn0hpXn8fKY=; b=j8r27pNrjCfLmaYV7HsR6JXUZsgZQCKEJ6cU3hlidFMwz6xKDsonf56zeVJLVGjvWreqBL Uinc/5U1W5BDLl3xpNQ93jAjySLVy99TjbLJQoQi7BgwSbZ8sK4Nit8OPahtJRNahAWOdY 3wYqv/+Jo7QNtanOY+rKqQqv4W0yuW0Rg6zHiDYqFMjcNNjLtLLnCQs8G7WA7SbbpF2FB0 o2f4JNBA6yqNoPpLjE9b2xUdn1yDexASVQcbKO/7Bo25++/FMTq3H/b674HLYiQJOuhCjw Bnlpu4P6vO5GQ7rvPVxaS3F9axEgzbCB4qZo5uQyrkhEgqYPFyQvJZQ2V1t9YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647304479; a=rsa-sha256; cv=none; b=jiXlbihAGFxeKaylHTehCUDM9qfRBI7mXpvT91qQFYcAPZ3HFJyzMLLS8uXJLyYElXE2PS iwfeElib97Kjc2Md4hEe0fThfO/lXyD7yXynfhKaH0kpxDuqCX0qhHejJS7i5gLIuiOUdj 7naIkwa6eezFqKnxBv5YR8gOXIcCPMleQ8MBodrggpwHqWCgGtYkm0Z+ZYgmThyLFZcBEI pZwTT0TVEuCPNykgZTtAvXlYzS3LOFuwcFYgt0FpxuJsFFqcTtM1yBuAWkndK7nytcs7oI IV3jyMi9HKrPkj8eA3+Cfvf2vFmKIbTI4lB9yu9stNuO3u95uDi6knn1laYBUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d728011ee12e68935864cac4d670e2203d904306 commit d728011ee12e68935864cac4d670e2203d904306 Author: Jan Beich AuthorDate: 2022-03-14 21:31:31 +0000 Commit: Jan Beich CommitDate: 2022-03-15 00:31:30 +0000 graphics/mesa-devel: drop libdrm < 2.4.10 workaround after 0066fe2abf13 (cherry picked from commit 50151d51817b7924697ec69c81a3fd878d487060) --- graphics/mesa-devel/files/patch-libdrm-2.4.109 | 89 -------------------------- 1 file changed, 89 deletions(-) diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.109 b/graphics/mesa-devel/files/patch-libdrm-2.4.109 deleted file mode 100644 index 6d15483322a9..000000000000 --- a/graphics/mesa-devel/files/patch-libdrm-2.4.109 +++ /dev/null @@ -1,89 +0,0 @@ -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;