From nobody Sat Nov 9 22:17:39 2024 X-Original-To: dev-commits-ports-all@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 4Xm9D3679Rz5ckd4; Sat, 09 Nov 2024 22:17: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm9D34KT5z4rl2; Sat, 9 Nov 2024 22:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731190659; 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=DCZu3VjBS3ZG4a3nHT3Bo0qgjgxsOAIv2qx0EKxtktA=; b=Y6HiRGXWHMV6clRfQNm29iSl8SwtmMe9467Y7+OepeC3C1lclySZxV3uzw6JlxXeIaXeDK KkXlYgRzVokrPpRZHYru/x1iG9yrm6IJpMZWLl4wPk9zpzzmcTosxOXTzNi8k8qfkWUXjw J4iz2C8nik7XP+tdwyarU0kHFN3Z3qE/LRsARhkhic3gdKqH4LNRPF6eJEL/R14o8w2jPh tC0VnwyZywaqpO4UTQkNw4MvhZUJzT5tYkWg6GMj2diCXLn8tJrcycUwMTzTKX1luyfO80 f7bqy1bGwwl5zE+Qq1tImXxYetpjemjnddsOmpyruu6otuuwxx1oTgb/7HSanw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731190659; 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=DCZu3VjBS3ZG4a3nHT3Bo0qgjgxsOAIv2qx0EKxtktA=; b=bmGVw/4oHd4k28jppl9fL6W7gkVsB8PahgZ3beSom9Hc9Aogt3H6ghVCVUKon5FyCYsfAS P8SBhovlksf4ourTPnNPnUrIn60sveBKQu2wdCUTG911CH2gOdU7+zFzm2vhkyD98FhSKY +7FHZI8y3Bbs232bUX5btRFuYlgl8vx6rd0K4s2poxBYXVOKAeYUGhdEpfUmCHSJle7ZZ3 kefXUL41XLKYatj3F0uUUNnXImSfIk08XeNAmqEkPd4ex710BzxCNaZx/Vttxrqvlf4y3M vajYsmkZ920tyXGAF6o22SruJmaj5i/9pfQffEV20VuH13ptlwnawhSodiLswA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731190659; a=rsa-sha256; cv=none; b=m5rpZ4N/m24MJoe2yoiRKWYWl2Cq561LWLz2ZLhGpy4O7CohC3cf2ZnZx21jT2rYQLj3C5 /uIkEnU5HuW4jFLDSkqcEllXbJodn25yef23TK55RMA3AsXYiVlZ68RXyVRX4+WQqoBzDD zDnoT1lvlpr3OaCEuK0YH8wS4pX4q5UbzRqYsH2sUK9mzyAnounYLGrDnVsq/dHncDpnpb 0KBKNRlzCOM4OlMRGt6PqJN29DTOYS5Itwz+MqO9Unn17rUREGPcdF90iZ2QANe3uf8Usn 6SLfJ4Zx3VZmz/YAVp47alS4owTvtWQ+dF5mx9vAetrBeyz9vvV/ozjDFyBsXA== 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 4Xm9D33xgnzGlK; Sat, 9 Nov 2024 22:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9MHdbC055860; Sat, 9 Nov 2024 22:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9MHdJp055857; Sat, 9 Nov 2024 22:17:39 GMT (envelope-from git) Date: Sat, 9 Nov 2024 22:17:39 GMT Message-Id: <202411092217.4A9MHdJp055857@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: 7393723ec0ee - main - graphics/mesa-devel: drop Clover from OPENCL option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 7393723ec0eeab8665e058831f790a103b16562a Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7393723ec0eeab8665e058831f790a103b16562a commit 7393723ec0eeab8665e058831f790a103b16562a Author: Jan Beich AuthorDate: 2024-11-09 01:25:43 +0000 Commit: Jan Beich CommitDate: 2024-11-09 22:16:34 +0000 graphics/mesa-devel: drop Clover from OPENCL option Pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19385 but after https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27783 is no longer supported on Intel GPUs. Instead of continuing blindly simply drop the feature. This port is limited to dogfood-ready features, anyway. --- graphics/mesa-devel/Makefile | 7 ++----- graphics/mesa-devel/pkg-plist | 8 -------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 22fb276d76a3..af331d886efd 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= mesa DISTVERSION= 24.2-branchpoint-5103 DISTVERSIONSUFFIX= -gc108dfc930f -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -115,10 +115,7 @@ OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-tran OPENCL_RUN_DEPENDS= libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} OPENCL_SOVERSION= ${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:} OPENCL_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" -OPENCL_MESON_TRUE= gallium-rusticl opencl-spirv -OPENCL_MESON_ON= -Dgallium-opencl=icd -OPENCL_MESON_OFF= -Dgallium-opencl=disabled -OPENCL_VARS+= COINST_RUN_DEPENDS+=clover>0:lang/clover # ICD +OPENCL_MESON_TRUE= gallium-rusticl OPENCL_IMPLIES= LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 3a64fd337ef2..b0eb73d983f4 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,6 +1,5 @@ %%VKLAYERS%%bin/mesa-overlay-control.py %%VKLAYERS%%bin/mesa-screenshot-control.py -%%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd %%OPENCL%%etc/OpenCL/vendors/rusticl.icd %%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf %%NO_COINST%%include/EGL/eglext_angle.h @@ -16,10 +15,6 @@ %%panfrost%%lib/dri%%SUFFIX%%/rockchip_dri.so %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so -%%OPENCL%%%%crocus%%lib/gallium-pipe%%SUFFIX%%/pipe_crocus.so -%%OPENCL%%%%iris%%lib/gallium-pipe%%SUFFIX%%/pipe_iris.so -%%OPENCL%%%%r600%%lib/gallium-pipe%%SUFFIX%%/pipe_r600.so -%%OPENCL%%%%radeonsi%%lib/gallium-pipe%%SUFFIX%%/pipe_radeonsi.so lib/gbm/dri%%SUFFIX%%_gbm.so %%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so lib/libEGL_mesa%%SUFFIX%%.so.0 @@ -27,9 +22,6 @@ lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 %%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 -%%OPENCL%%%%NO_COINST%%lib/libMesaOpenCL%%SUFFIX%%.so -%%OPENCL%%lib/libMesaOpenCL%%SUFFIX%%.so.1 -%%OPENCL%%lib/libMesaOpenCL%%SUFFIX%%.so.1.0.0 %%OPENCL%%lib/libRusticlOpenCL.so %%OPENCL%%lib/libRusticlOpenCL.so.1 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0