From nobody Sun Jan 15 07:39:26 2023 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 4Nvn9B4G74z2t9fB; Sun, 15 Jan 2023 07:39:26 +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 4Nvn9B3j6Yz469P; Sun, 15 Jan 2023 07:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673768366; 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=V7jctySgUxLIo1bgvATmIdSmqUV/pgdNLOZFlO0b0wY=; b=bNIhZG6XxAP0KRu3Aqqbvipah7Ei3/6gRu1oWCqx6KyBq/c9vcfhaAowi3Qz7Y90X7A/xA dVKm/GrdhLWpPlsqkAHMqOQ6wUlLm78oT9Z0VmB2mWO/nd10kARgWSLuCZonGqHtzuwFp9 X1sydy/MXkqVFZqGFamLSLXHaTz7GksmGYIbhckwHpvU4r9oGJTEbTGYpKlzTNGWpmb6OD /ChnQ4sFYDWcSS5o/nts3db2Hu5u2rbLAlWtboCOMNtoMgcY1rBqu6IvaNClNGb4qmKUSq U0U603u/jIR80AJuAl5iY8BqVuGw5amHU2kVoPQYp/H5+LAbocBu4tKgCTSS7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673768366; 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=V7jctySgUxLIo1bgvATmIdSmqUV/pgdNLOZFlO0b0wY=; b=IBWxi5D3GhJLplT3L0Sqa645PnmXbHBx0F5wC41ID5PfNvNsb62ls2xv68wQ7swzQ8n7JV z5+YEmUSagih+kOzw4F00RQgMa2ZJWD+3g7ZVUhACr5zvXbd+da+n/l5b8HOwKxQAl7y7V T83ATVB1UIMAFAuH6sabMX5A+Spbj0nEAWA45Zw0YR7ohYzrWwd82sdGP0GzrYd3C8TdYA yDda/ukRTI0JXTLXRRyWYjB5mBqF5kWyr7xobOSCHrCZ7LRDd/0rwbj1YbavPLlAjO9GSQ DARblcMOry805xIC1U8LxXSpwDSkCJXM3mjV4G9CqcHUXw1tvXTXP+Lgq2aQXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673768366; a=rsa-sha256; cv=none; b=Z8lPvJ3MM/RkLZ0TMo2Z7hrkHW/bnhCNr0kiOLBXgaSH67+mq2RD96Q9F1V+JmRxUpe0r8 /F0lglWlIuN4LKXtABTQJuQKIsQR0J7gE1bQB/tsgsiibuUAPm+WPNKVyGjVPQ7ywBJUux w5HHtDDFTBBy/AeWx6R/9PCfPkDLiDmsbm8BJEMs9syP2KQ2YrUrJ3jAeJNno5RHFV8iVq mjHkhHuaCU+29iF4z3N7wFe0wIwh1EzkAjvNMZbcdfpXbBHS6ZJXqLj5b7YBfhrLi/AGtj 9Zv+DLcJIykv9da84vHqaK5vxxWKNuCLcFC/JRYUOzddTgDMBS0IWavFhWTvaA== 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 4Nvn9B2fc2zJwb; Sun, 15 Jan 2023 07:39:26 +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 30F7dQcm085190; Sun, 15 Jan 2023 07:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30F7dQ6e085189; Sun, 15 Jan 2023 07:39:26 GMT (envelope-from git) Date: Sun, 15 Jan 2023 07:39:26 GMT Message-Id: <202301150739.30F7dQ6e085189@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 90c843a59db4 - main - graphics/blender-lts29: remove outdated LLVM_VER handling 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90c843a59db4941881ff164f6f4af2641e6e8bcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=90c843a59db4941881ff164f6f4af2641e6e8bcf commit 90c843a59db4941881ff164f6f4af2641e6e8bcf Author: Tobias C. Berner AuthorDate: 2023-01-15 07:32:27 +0000 Commit: Tobias C. Berner CommitDate: 2023-01-15 07:32:27 +0000 graphics/blender-lts29: remove outdated LLVM_VER handling --- graphics/blender-lts29/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/graphics/blender-lts29/Makefile b/graphics/blender-lts29/Makefile index b91cfa674791..4be5663454d1 100644 --- a/graphics/blender-lts29/Makefile +++ b/graphics/blender-lts29/Makefile @@ -88,11 +88,11 @@ CYCLESEMBR_ONLY_FOR_ARCHS_REASON= embree only supports amd64 CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ - -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ + -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}" \ -DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders" -CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage -CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} @@ -188,12 +188,6 @@ CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON CMAKE_ARGS+= -DWITH_CPU_SIMD:BOOL=OFF .endif -.if ${LLVM_DEFAULT:M[678]0} -LLVM_VER= 90 -.else -LLVM_VER= ${LLVM_DEFAULT} -.endif - post-build: @(cd ${WRKSRC}/doc/manpage && \ ${PYTHON_CMD} blender.1.py \