From nobody Sat May 28 12:53:50 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 415DA1B5E99F; Sat, 28 May 2022 12:53:51 +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 4L9M726Slrz4sjD; Sat, 28 May 2022 12:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653742430; 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=sVbah4Lknjhipu8qOenUazc5a7D8XWdz8xWe+pAdcV8=; b=CyuWgLYg0DMsnkV2ItkzKSdPHMvDDJb1ZjC4fJXGpEUdDn/Qq/+fHcEI3T1edj1Mi2wLTE o3rkB71Yws0cNFcq5RHIU1SVdSvbbszyxMuLNQghZphhR8Ih0YouH2NC16kwSlRvpUE9FD mWRT6V8YEOcd7Sthjuw7Bg97sOFu18hfv8TwM25VVRZB5YO9Q1B6+qizHRSHKG2GPZmsbi nnym72lPc/CrD+qfBkjGbWL0PeIYSHfyyge3Sdn9dXY+eKMhLw4Y8puC9KEf9/YWLoF232 LzSmSdFzkS1j4BMwmBHI/j8dNxihUNHmiarp/jWimmkqpvo8Bm/EfDd7iQTKlA== 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 9CFCD7262; Sat, 28 May 2022 12:53:50 +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 24SCroV1053408; Sat, 28 May 2022 12:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SCropq053407; Sat, 28 May 2022 12:53:50 GMT (envelope-from git) Date: Sat, 28 May 2022 12:53:50 GMT Message-Id: <202205281253.24SCropq053407@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: 845dc5c968bf - main - graphics/openshadinglanguage: unbreak build with llvm14 (+) 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: 845dc5c968bf59fc1625ca1cc9c178d2094d877c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653742430; 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=sVbah4Lknjhipu8qOenUazc5a7D8XWdz8xWe+pAdcV8=; b=MPOQycNlkXpaUca5z2I0f9Tr1xm23ny+Wt6vtq/iTvm/3meCQ1dSwmTjiGaPRznGgt8HFa bP6QjlDXnx4T6aTtdmB5qi5y0ZEKm26rok123RdlNAFq1d23Zt3MwgyqBsKv4diHZX6dKK AHDtbFUXeEa0msyNyGojgkFXVZfD+0hnl6WStyqrK50oyTsJxDe0nFzFEP7Sb+iJPRqtm6 YCymARtXHnHCzzfsfB6QsgOfBvahtucS/xS078T3lSIkkRrnNTJyhHa1ECeaLa06Yh1eKi zcl/6fJkXFAf/mDh6OSLUMEaBpao2wdWyOCUsqftCmPnjz6YBNcY3oJVPNF2Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653742430; a=rsa-sha256; cv=none; b=F6w1lxLJmJt5Ee7dSYGMRTQ5QvVtR72CI6oVQ62yct7fXU6uBuY/d3nXgKEUf29ATKZyus md+YfsfTmhfAH6cs3iUQie5RyEIcye5wYsEskoRWveCcd/J6rXb+CbdfG6/mUcKsRXqKNI 5riaNxbo+QJWLxirvKeDsJPC8iyBfKj86PEbj0M148bbrD+whzGfIk8pNJKATv1ZASQ7Pc xH0eeNIKZQtiVZi68tQqc/z96kQx3cgOGD/q8gX8DHuFa2Z7Cx2xoAlB5hKFNPh6SKLlFw l4ZwYrAC3CotRHIxYxImlpMho4LidcKYXMsZxmeiTuoAgZL987utXd+RcVViGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=845dc5c968bf59fc1625ca1cc9c178d2094d877c commit 845dc5c968bf59fc1625ca1cc9c178d2094d877c Author: Dima Panov AuthorDate: 2022-05-28 12:51:29 +0000 Commit: Dima Panov CommitDate: 2022-05-28 12:51:29 +0000 graphics/openshadinglanguage: unbreak build with llvm14 (+) LLVM14 bundle have moved TargetRegistry.h from Support to MC subdir Obtained from: upstream Approved by: portmgr blanket --- graphics/openshadinglanguage/files/patch-llvm14 | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/graphics/openshadinglanguage/files/patch-llvm14 b/graphics/openshadinglanguage/files/patch-llvm14 new file mode 100644 index 000000000000..c8912440145a --- /dev/null +++ b/graphics/openshadinglanguage/files/patch-llvm14 @@ -0,0 +1,29 @@ +diff --git src/build-scripts/build_llvm.bash src/build-scripts/build_llvm.bash +index 2e8f49fca..3b375e543 100755 +--- src/build-scripts/build_llvm.bash ++++ src/build-scripts/build_llvm.bash +@@ -29,7 +29,7 @@ if [[ `uname` == "Linux" ]] ; then + fi + LLVMTAR=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-${LLVM_DISTRO_NAME}.tar.xz + echo LLVMTAR = $LLVMTAR +- if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] || [[ "$LLVM_VERSION" == "11.1.0" ]] || [[ "$LLVM_VERSION" == "12.0.0" ]] ; then ++ if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] || [[ "$LLVM_VERSION" == "11.1.0" ]] || [[ "$LLVM_VERSION" == "12.0.0" ]] || [[ "$LLVM_VERSION" == "13.0.0" ]] || [[ "$LLVM_VERSION" == "14.0.0" ]] || [[ "$LLVM_VERSION" == "14.0.1" ]] ; then + # new + curl --location https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR + else +diff --git src/liboslexec/llvm_util.cpp src/liboslexec/llvm_util.cpp +index b30c89318..22d4134ba 100644 +--- src/liboslexec/llvm_util.cpp ++++ src/liboslexec/llvm_util.cpp +@@ -45,7 +45,11 @@ + #include + #include + #include ++#if OSL_LLVM_VERSION < 140 + #include ++#else ++#include ++#endif + + #include + #include