From nobody Sat Dec 31 18:36:39 2022 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 4NkrSR6cPsz2l2YV; Sat, 31 Dec 2022 18:36: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 4NkrSR5m29z3hcm; Sat, 31 Dec 2022 18:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672511799; 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=YuPwsSu/x3PhoBvkRZBqTHS4+q76AzKYoLgQx/t0/UY=; b=ac0VMGad7+IVb/E1OHyZHtePotLAeMit3aLcka7NVo9FrVYTxbzAEAQeyo9EMxXO5rSkCd uaWahJ8INmxO3jSOm5Q5Q/qYAbAXJ5jkWz4uSxQdM5Ybm1hAZ7zuWXcc1fsQ3FpzMy83S1 pKUw2YyzdXOkJL397NhhU2hE+C3rcD2sAcCvIqiwHQPBrQgZ3PM+oBG8Mah4m0mJH1xURq 9fUgFmoaZRmAoaC95bcQa+9ozCej311a01MUbOUtQfJraYD2Z9rIR+g4TOIDOV0l40WTfh bh4MTshx6y1d4p8QrQ/2q0s1LTvZjFMr9ao6EXUCQXp2VnXRimHbn1I0h1qz7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672511799; 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=YuPwsSu/x3PhoBvkRZBqTHS4+q76AzKYoLgQx/t0/UY=; b=QWeTSEn5CNjAY+Gy/co6L4VV3Bw0h4R5un/y+kgKXMioA3DlBkvy31lMdnHBdBaqPq55J3 RtOta+Nib73rFvD9Qt2VChA0jSyjFArkFCY7zwOa3giWRG/Qb2QhcYpujJLITcApri/fum cJaJyMRo2w9aC7CY6y0xH1XvamCNwQNmDjS67ssdKEy1F5cLU9t7E8gW6u7Jc62xF1DLk9 FPWIV3CV86zQ3ZjSd4LAPQWE4kXCGO87lv8Q32xIc7rJMLpaq5KC7ylRTvHrQP1i+XcxRn tr4z8M0/2Z+kXN5yzlUdTotLItC3dGnnrubmBFKBX0qK2fBCZLnpNL57K5Lp4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672511799; a=rsa-sha256; cv=none; b=jSjk9DlGP7TvsTs6tzXivNyW2mrVi2CgOT2dooPL1zX1vWRq1fSeJScRItHPm0jv61eBwp Fq/90tgJCbFkcskVtcWyihOMN2u9cFjtdcL0G8xybZ6jVZeDNsbcxmh+LKvj6tNUfIeROb mNaH24rz+yi9kFM/pFlOj35Q3WcjveDmbaqTZWEKR3f/NF9EZ/C64e58g9KGU7QxcQgSV3 XyrnBjCy0LfRLwGqLQnrwL5KmbdOF9LUQsaDjJc6HIDCYzSKEpQaitbaC24/cWzz5A9FZl vx12n4H8IWHMFXeeOaPZXBteD4UDF44vdur2QAv9ICwDhiSuu657gNz06WGpZw== 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 4NkrSR4dbczyFl; Sat, 31 Dec 2022 18:36: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 2BVIadoQ099572; Sat, 31 Dec 2022 18:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVIadW8099571; Sat, 31 Dec 2022 18:36:39 GMT (envelope-from git) Date: Sat, 31 Dec 2022 18:36:39 GMT Message-Id: <202212311836.2BVIadW8099571@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 444f09a0db09 - main - graphics/blender: adjust variable name LLVM_VER => LLVM_VERSION after transition to USES=llvm (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 444f09a0db09c0295b8f230c2dac3da8ffcf2e7c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=444f09a0db09c0295b8f230c2dac3da8ffcf2e7c commit 444f09a0db09c0295b8f230c2dac3da8ffcf2e7c Author: Dima Panov AuthorDate: 2022-12-31 18:34:41 +0000 Commit: Dima Panov CommitDate: 2022-12-31 18:36:26 +0000 graphics/blender: adjust variable name LLVM_VER => LLVM_VERSION after transition to USES=llvm (+) Reported by: VVD PR: 268331 --- graphics/blender/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 2f864ca0c2f9..bb531c07e9ea 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -80,11 +80,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_VERSION}" \ -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_VERSION}:devel/llvm${LLVM_VERSION} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage -CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} @@ -198,7 +198,7 @@ CMAKE_ARGS+= -DWITH_CPU_SSE:BOOL=OFF .endif post-patch: - ${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VER}|g' \ + ${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VERSION}|g' \ ${WRKSRC}/intern/cycles/kernel/osl/CMakeLists.txt post-build: