From nobody Mon Feb 06 15:41:45 2023 X-Original-To: dev-commits-ports-main@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 4P9VqZ2DQ0z3ktHt; Mon, 6 Feb 2023 15:41:46 +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 4P9VqZ1SHlz4DPM; Mon, 6 Feb 2023 15:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675698106; 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=VlX9xGOkUE5LjFnR1kKTJPf/NRriJpQcuJ3sABRTpgE=; b=bSOelYMdPE/HAcxXSD8pmhIwYacLAOUKCqFl9QV82UUpSF1EJoxkmrQUHIQvvB4tErjLlS 5EKAb32gTtQLhC7U4MF2n5Ys/YaZKyct1mAQFrXuLnR/lSccDDHK70F1IuezFo1Lh8769D JNHNVSTbPqn9uP3FdFkoIiF0uDjWTVAoeND/gSCoIkM2mJKlIAkPScbytWbDED1yTo3VYe TdRfY0IzUtscN53W6YUZAj1WU2NEJZYf8gfap7aUut6rjlk8CpbKylQnU3hsPau7CHJB2M oa4DGR4QWUoyRWKcVmHTVHDGRBI0NClitELnMbVZraYpRYjnGLTJcSDZNY/KHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675698106; 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=VlX9xGOkUE5LjFnR1kKTJPf/NRriJpQcuJ3sABRTpgE=; b=lPrj0LorFiASXUg0ePBEHQZTZdvVTyDqYrDjHnOZC7Do9CrG7zn1+IeFWgiYiWIbO0Wa8x G0ZLXAyju2g78a6diT1oWZewonsAN8pQECs7xMEzRkXcNvVZzgyygd5MAT8fmFFvFS3JJP RWMwvbolvphAhyCPw3jG7ZsrzC1jaYqEDPxz5oYYQ61W5oEawIgpmljKYXou+XUdSfUDkZ srzRK8L7K2WXgtr0WRPbrGQTSZG6djrST8tKMnfT8RU4MyROS/JSrpXJiVhbD9NS2ak6Xr 0IZpEc8lDQzAK2bwEJpbz7myI2CklB0zLyNpwztrVJPvYhs2F5kOXljIuch1wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675698106; a=rsa-sha256; cv=none; b=f1ZJCKbwNYsrVEWRBHBBeNp8ON30c0fhWIz1DW09vCQvDzcSXZy7t/jxgdAHWn46te2F4y sHmqo/XD/blrElg6EC8m2+oci96SJnpIslnko9pEtJhfLwXdyjU2YWzHJ+wYQ1khyggOyM 5QvBLJ3Zx1IvDQe+XFqabT+WNZ+GJiPmtbyWvou6NZeYO454JHkaAhPmyA+pOmowmAYC/u pQe7RgSfd2A/TA3Z1xesVJNzOFO8NpZ3HtdJLh+C5GlQzKQPNZWaeFVvCIK8J1hn7s6Wir 1iDFRTM9fhR4Jc++JtTw8fplhYlZkhmhxNpgiHroKoV3EAd9Ja/G6ikDbzGj0g== 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 4P9VqZ0VqZzfxv; Mon, 6 Feb 2023 15:41:46 +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 316FfjaO084109; Mon, 6 Feb 2023 15:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316FfjrR084108; Mon, 6 Feb 2023 15:41:45 GMT (envelope-from git) Date: Mon, 6 Feb 2023 15:41:45 GMT Message-Id: <202302061541.316FfjrR084108@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: 1b31e75ea55e - main - graphics/mesa-devel: simplify bc572c0c0eda List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 1b31e75ea55e57d139a2039cdd441132862a6bf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b31e75ea55e57d139a2039cdd441132862a6bf3 commit 1b31e75ea55e57d139a2039cdd441132862a6bf3 Author: Jan Beich AuthorDate: 2023-02-06 15:38:50 +0000 Commit: Jan Beich CommitDate: 2023-02-06 15:39:07 +0000 graphics/mesa-devel: simplify bc572c0c0eda ICD for EGL is part of mesa-libs but ICD for Vulkan is part of mesa-dri. Instead of trying to track which package provides which file just specify package names this one is designed to override. --- graphics/mesa-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 815ffa05c644..6ebedca86fbd 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -84,7 +84,7 @@ radv_BUILD_DEPENDS= glslangValidator:graphics/glslang COINST_DESC= Allow co-installation with another Mesa port COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} -COINST_RUN_DEPENDS= ${LOCALBASE}/share/glvnd/egl_vendor.d/50_${PORTNAME}.json:graphics/mesa-dri +COINST_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri # ICD COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} @@ -117,7 +117,7 @@ OPENCL_MESON_TRUE= gallium-rusticl OPENCL_MESON_ON= -Dgallium-opencl=icd OPENCL_VARS= LLVM_USES=llvm:15,lib # chase libclc + rust (LTO) .if ${MACHINE_ARCH} != aarch64 # XXX missing in ONLY_FOR_ARCHS -OPENCL_VARS+= COINST_RUN_DEPENDS+=${LOCALBASE}/etc/OpenCL/vendors/${PORTNAME}.icd:lang/clover +OPENCL_VARS+= COINST_RUN_DEPENDS+=clover>0:lang/clover # ICD .endif OPENCL_IMPLIES= LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM