From nobody Tue Nov 12 00:18:05 2024 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 4XnRp61RQNz5cqL0; Tue, 12 Nov 2024 00:18:06 +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 4XnRp55M5nz4w7l; Tue, 12 Nov 2024 00:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731370685; 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=qC+OqYGk704JtMM6r8Bxb7YaIS5wk4l6fgsR838D+xs=; b=XGc2P9yYzvi9xZ09PrTx2nJ1+Y8iarCn63sQNfiLnqHu8XPUVdgD3Z9p1JaolIcPn3HbCa dFYA7NCycQ6s3UKBh0Xa1cUo4Dxsr2Dr/7rBud9SUKN7VNWAFDatBfbCC+FA8v5reRHVVh p1edYzQmQHPMzo7KY7Gwu2nWssWQQYZSV0egSO7rY/Y8wbXnLZW/KHxBtTCSZcRwEXQi0X yIYpZxwmfkFrmHwIQ0skMlKJyquWCo2We5kD3DDwfBrqyVdlL91mbTwj1+IT0FldzJZ2Qb WCxK78Dn/Vg0bM+4an15GLB33Qwp4qhomKBVRgLziKVWaRZaMOTMZBa6Sc+Uzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731370685; 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=qC+OqYGk704JtMM6r8Bxb7YaIS5wk4l6fgsR838D+xs=; b=fT0Dgezk2EPhI4B+VIeqhh3X4n+l5w/gQMwEicigaxteOm3CcpTWP4VPaQxaYTEkBJfg/Z YFSIlJ5CJyEZKAysVMPiRCaSgEMzoEXJr0GdU6ja35Ex/ZfZ3q1gR1J3t1015RAAbTXf+a kyx9bGOmgW78x4I9RvRN6Ln+Fsa5B56TZFCjar/8D2itkISW2+UPnmhXNYVFVtUM4gpFfQ FFlaCxpvOnmaSJtvBLu4+A2jYXaC6qblD/qe3EhqlIWoPpv/WLq5K2cIl7NJIqqYJdLPCE FbZkj9QRtW2vd80VCry3gqgifztLrjkLndOI+DTer24p7jj4Z9ZDddF6/FUf3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731370685; a=rsa-sha256; cv=none; b=O30WLGZz2y5NvSuPu/+19OrRn5Cr8CTxepIsBL1xnN3T4ly9oiP5LVfCS5/Onp5+BU/Dqn 4bZLex5ZexqwLajxE6dz1ZGOBEs5ghcvAchnvyf74FJsQBkD66yw/HhGp35AcwNpuuUZDG 0pB2IMqlCAiWxmwwLfZXwc4TUr/7KCPEwyTHVh0Dt65qzDcd28CB9N7gTVyZN6y75UVzM+ /R4SoxWqEVzGSZO8Md39rMnC0j4yHtbakQiOgqViZh8PiSBgVd9cHlmREWwmoJTUgtdLs1 avFN5zsIyFR2RlGjz1pRL/WnRhmiwm9XIDNEYYt7AL8vDG4BXgyJh+vGwIIiDw== 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 4XnRp54Z3NzngZ; Tue, 12 Nov 2024 00:18:05 +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 4AC0I5b3023588; Tue, 12 Nov 2024 00:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AC0I50q023585; Tue, 12 Nov 2024 00:18:05 GMT (envelope-from git) Date: Tue, 12 Nov 2024 00:18:05 GMT Message-Id: <202411120018.4AC0I50q023585@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: 410b991a19d4 - main - graphics/mesa-devel: drop Clover leftovers after 7393723ec0ee 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 410b991a19d485d02da9996eb2262b0f358e196f Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=410b991a19d485d02da9996eb2262b0f358e196f commit 410b991a19d485d02da9996eb2262b0f358e196f Author: Jan Beich AuthorDate: 2024-11-10 13:22:06 +0000 Commit: Jan Beich CommitDate: 2024-11-12 00:07:32 +0000 graphics/mesa-devel: drop Clover leftovers after 7393723ec0ee --- graphics/mesa-devel/Makefile | 2 -- graphics/mesa-devel/files/libmap.conf.in | 2 -- graphics/mesa-devel/files/patch-suffix | 20 -------------------- 3 files changed, 24 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index cd950435d0e3..fdefa34db11a 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -151,8 +151,6 @@ post-patch: ${WRKSRC}/bin/git_sha1_gen.py post-patch-COINST-on: - @${MV} ${WRKSRC}/src/gallium/targets/opencl/MesaOpenCL.def.in \ - ${WRKSRC}/src/gallium/targets/opencl/MesaOpenCL${PKGNAMESUFFIX}.def.in @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf @${MV} ${WRKSRC}/src/util/00-radv-defaults.conf \ diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in index 70839fa6a0b6..319d4562dc1a 100644 --- a/graphics/mesa-devel/files/libmap.conf.in +++ b/graphics/mesa-devel/files/libmap.conf.in @@ -9,8 +9,6 @@ libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 libgbm.so.1 libgbm%%SUFFIX%%.so.1 %%PREFIX%%/lib/gbm/dri_gbm.so %%PREFIX%%/lib/gbm/dri%%SUFFIX%%_gbm.so -%%OPENCL%%libMesaOpenCL.so.1 libMesaOpenCL%%SUFFIX%%.so.1 - %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so %%hasvk%%%%PREFIX%%/lib/libvulkan_intel_hasvk.so libvulkan_intel_hasvk%%SUFFIX%%.so %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index e64ac28dbf42..d20ed6558b4c 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -84,26 +84,6 @@ Library selection is handled by libglvnd and/or libmap.conf. files('dri_target.c'), include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, ---- src/gallium/targets/opencl/meson.build.orig 2023-02-01 23:53:26 UTC -+++ src/gallium/targets/opencl/meson.build -@@ -30,7 +30,7 @@ llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBR - endif - - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') --opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' -+opencl_libname = with_opencl_icd ? 'MesaOpenCL' + get_option('egl-lib-suffix') : 'OpenCL' - - polly_dep = null_dep - polly_isl_dep = null_dep -@@ -117,7 +117,7 @@ if with_opencl_icd - - if with_opencl_icd - _config = configuration_data() -- _config.set('OPENCL_LIBNAME', 'MesaOpenCL') -+ _config.set('OPENCL_LIBNAME', 'MesaOpenCL' + get_option('egl-lib-suffix')) - _config.set('OPENCL_VERSION', opencl_version) - configure_file( - configuration : _config, --- src/gallium/targets/pipe-loader/meson.build.orig 2023-02-01 23:53:26 UTC +++ src/gallium/targets/pipe-loader/meson.build @@ -44,7 +44,7 @@ endif