[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Saturday, December 12, 2020 @ 15:28:41 Author: felixonmars Revision: 773309 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 773308, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 773308, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 38 2 files changed, 123 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 773308, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-12-12 15:28:41 UTC (rev 773309) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 773308, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Sunday, December 6, 2020 @ 21:11:55 Author: foutrelis Revision: 771197 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 771196, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 771196, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 38 2 files changed, 123 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 771196, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-12-06 21:11:55 UTC (rev 771197) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 771196, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Tuesday, November 10, 2020 @ 05:09:52 Author: foutrelis Revision: 749333 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 749330, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 749331, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 38 2 files changed, 123 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 749330, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-11-10 05:09:52 UTC (rev 749333) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 749331, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Saturday, October 17, 2020 @ 18:01:27 Author: foutrelis Revision: 725535 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 725534, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 725534, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 38 2 files changed, 123 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 725534, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-10-17 18:01:27 UTC (rev 725535) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 725534, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Friday, September 4, 2020 @ 21:13:37 Author: svenstaro Revision: 698651 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 698650, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 698650, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 38 2 files changed, 123 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 698650, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-09-04 21:13:37 UTC (rev 698651) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 698650, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Tuesday, May 12, 2020 @ 09:37:01 Author: arojas Revision: 626645 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 626644, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 626644, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 46 + 2 files changed, 131 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 626644, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-05-12 09:37:01 UTC (rev 626645) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 626644, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Saturday, May 9, 2020 @ 16:18:25 Author: arojas Revision: 625999 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 625998, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 625998, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 46 + 2 files changed, 131 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 625998, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-05-09 16:18:25 UTC (rev 625999) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 625998, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Wednesday, April 15, 2020 @ 22:53:04 Author: foutrelis Revision: 615076 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 615075, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 615075, openshadinglanguage/trunk/PKGBUILD) -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 85 ++ PKGBUILD| 46 + 2 files changed, 131 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 615075, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) === --- community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (rev 0) +++ community-staging-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-04-15 22:53:04 UTC (rev 615076) @@ -0,0 +1,85 @@ +From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001 +From: Christopher Kulla +Date: Thu, 12 Mar 2020 13:16:19 -0700 +Subject: [PATCH] Allow OSL to compile with LLVM 10.x (#1128) + +--- + src/liboslexec/backendllvm.cpp | 4 + src/liboslexec/llvm_util.cpp | 27 +-- + 2 files changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +index 263d8cab..93e091b0 100644 +--- a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp +@@ -368,7 +368,11 @@ BackendLLVM::addCUDAVariable(const std::string& name, int size, int alignment, + + ASSERT (g_var && "Unable to create GlobalVariable"); + ++#if OSL_LLVM_VERSION >= 100 ++g_var->setAlignment (llvm::MaybeAlign(alignment)); ++#else + g_var->setAlignment (alignment); ++#endif + g_var->setLinkage(llvm::GlobalValue::ExternalLinkage); + g_var->setVisibility (llvm::GlobalValue::DefaultVisibility); + g_var->setInitializer(constant); +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 8fa915fe..dde2f1e6 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -1160,8 +1160,12 @@ LLVM_Util::op_return (llvm::Value *retval) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-uint64_t(len), (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), uint64_t(len), ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1169,8 +1173,12 @@ LLVM_Util::op_memset (llvm::Value *ptr, int val, int len, int align) + void + LLVM_Util::op_memset (llvm::Value *ptr, int val, llvm::Value *len, int align) + { +-builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), +-len, (unsigned)align); ++builder().CreateMemSet (ptr, builder().getInt8((unsigned char)val), len, ++#if OSL_LLVM_VERSION >= 100 ++llvm::MaybeAlign(align)); ++#else ++unsigned(align)); ++#endif + } + + +@@ -1187,7 +1195,10 @@ void + LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign, + llvm::Value *src, int srcalign, int len) + { +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++builder().CreateMemCpy (dst, llvm::MaybeAlign(dstalign), src, llvm::MaybeAlign(srcalign), ++uint64_t(len)); ++#elif OSL_LLVM_VERSION >= 70 + builder().CreateMemCpy (dst, (unsigned)dstalign, src, (unsigned)srcalign, + uint64_t(len)); + #else +@@ -1588,7 +1599,11 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name, + llvm::raw_svector_ostream assembly_stream (assembly); + + // TODO: Make sure rounding modes, etc., are set correctly +-#if OSL_LLVM_VERSION >= 70 ++#if OSL_LLVM_VERSION >= 100 ++target_machine->addPassesToEmitFile (mod_pm, assembly_stream, ++ nullptr, // FIXME: Correct? ++ llvm::CGFT_AssemblyFile); ++#elif OSL_LLVM_VERSION >= 70 + target_machine->addPassesToEmitFile (mod_pm, assembly_stream, + nullptr, // FIXME: Correct? + llvm::TargetMachine::CGFT_AssemblyFile); Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 615075, openshadinglanguage/trunk/PKGBUILD)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Sunday, October 6, 2019 @ 10:22:57 Author: foutrelis Revision: 513204 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 513203, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm9.patch (from rev 513203, openshadinglanguage/trunk/llvm9.patch) -+ PKGBUILD| 47 +++ llvm9.patch | 22 ++ 2 files changed, 69 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 513203, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-10-06 10:22:57 UTC (rev 513204) @@ -0,0 +1,47 @@ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.10.6 +pkgrel=3 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'python' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz +llvm9.patch) +sha512sums=('5d3a735fa33bfebdba9082345dcfeb89c17e876c9958d8af78f4e2150153062013a88644fc612b5778236eebb16a5ebae9a6d0adb4ff1e152a5c451905220481' + 'a52e0c103da6c800115f7140b3d29b78e20cb1a6a704bfe7440c50f1e398997dfd77723bfa9d6001aea7d2a249c3ebcbda3e94ea3ad512830f012a0b0b4bd77b') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + patch -Np1 -i ../llvm9.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + mkdir "$pkgdir"/usr/share/OSL + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm9.patch (from rev 513203, openshadinglanguage/trunk/llvm9.patch) === --- community-staging-x86_64/llvm9.patch(rev 0) +++ community-staging-x86_64/llvm9.patch2019-10-06 10:22:57 UTC (rev 513204) @@ -0,0 +1,22 @@ +From 00984c339f524319b38786710528fecbeb1397a1 Mon Sep 17 00:00:00 2001 +From: Larry Gritz +Date: Thu, 12 Sep 2019 13:11:27 -0700 +Subject: [PATCH] LLVM 9 / clang 9 compatibility (#1058) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 1746ec628..838df1e21 100644 +--- a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +@@ -682,7 +682,12 @@ LLVM_Util::make_function (const std::string , bool fastcall, + bool varargs) + { + llvm::FunctionType *functype = type_function (rettype, params, varargs); ++#if OSL_LLVM_VERSION >= 90 ++auto funccallee = module()->getOrInsertFunction(name, functype); ++llvm::Value* c = funccallee.getCallee(); ++#else + llvm::Constant *c = module()->getOrInsertFunction (name, functype); ++#endif + ASSERT (c && "getOrInsertFunction returned NULL"); + ASSERT_MSG (llvm::isa(c), + "Declaration for %s is wrong, LLVM had to make a cast", name.c_str());
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Tuesday, September 18, 2018 @ 00:48:10 Author: foutrelis Revision: 382834 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 382833, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 382833, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 48 llvm-static-system-libs.patch | 15 2 files changed, 63 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 382833, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-09-18 00:48:10 UTC (rev 382834) @@ -0,0 +1,48 @@ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.9 +pkgrel=7 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'python' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + mkdir "$pkgdir"/usr/share/OSL + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 382833, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2018-09-18 00:48:10 UTC (rev 382834) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Wednesday, August 22, 2018 @ 07:36:40 Author: arojas Revision: 373204 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 373203, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 373203, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 49 llvm-static-system-libs.patch | 15 2 files changed, 64 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 373203, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-08-22 07:36:40 UTC (rev 373204) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.9 +pkgrel=6 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + mkdir "$pkgdir"/usr/share/OSL + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 373203, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2018-08-22 07:36:40 UTC (rev 373204) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Friday, June 8, 2018 @ 04:00:16 Author: foutrelis Revision: 341925 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 341924, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 341924, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 50 llvm-static-system-libs.patch | 15 2 files changed, 65 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 341924, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-06-08 04:00:16 UTC (rev 341925) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.9 +pkgrel=5 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + mkdir "$pkgdir"/usr/share/OSL + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 341924, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2018-06-08 04:00:16 UTC (rev 341925) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Sunday, June 3, 2018 @ 01:18:05 Author: foutrelis Revision: 338509 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 338508, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 338508, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 48 llvm-static-system-libs.patch | 15 2 files changed, 63 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 338508, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-06-03 01:18:05 UTC (rev 338509) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.9 +pkgrel=2 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 338508, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2018-06-03 01:18:05 UTC (rev 338509) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Thursday, March 29, 2018 @ 04:50:25 Author: svenstaro Revision: 313240 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/ openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313239, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313239, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 48 llvm-static-system-libs.patch | 15 2 files changed, 63 insertions(+) Copied: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313239, openshadinglanguage/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2018-03-29 04:50:25 UTC (rev 313240) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase+pkgname=openshadinglanguage +pkgver=1.9.7 +pkgrel=2 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('ab232e45eaecb9d56938bfbd2a76999c3dc3033c31cdae3bd48f18642f98211b7255aa2a11bfda13a29100f4bfeade0643d34cb5007d23662894a48139b166e5') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313239, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-testing-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-testing-x86_64/llvm-static-system-libs.patch 2018-03-29 04:50:25 UTC (rev 313240) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Thursday, March 29, 2018 @ 04:39:34 Author: svenstaro Revision: 313235 archrelease: copy trunk to testing-x86_64 Added: openshadinglanguage/repos/testing-x86_64/ openshadinglanguage/repos/testing-x86_64/PKGBUILD (from rev 313234, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/testing-x86_64/llvm-static-system-libs.patch (from rev 313234, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 48 llvm-static-system-libs.patch | 15 2 files changed, 63 insertions(+) Copied: openshadinglanguage/repos/testing-x86_64/PKGBUILD (from rev 313234, openshadinglanguage/trunk/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2018-03-29 04:39:34 UTC (rev 313235) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase+pkgname=openshadinglanguage +pkgver=1.9.7 +pkgrel=2 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('ab232e45eaecb9d56938bfbd2a76999c3dc3033c31cdae3bd48f18642f98211b7255aa2a11bfda13a29100f4bfeade0643d34cb5007d23662894a48139b166e5') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/testing-x86_64/llvm-static-system-libs.patch (from rev 313234, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- testing-x86_64/llvm-static-system-libs.patch (rev 0) +++ testing-x86_64/llvm-static-system-libs.patch2018-03-29 04:39:34 UTC (rev 313235) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Wednesday, March 28, 2018 @ 22:52:55 Author: svenstaro Revision: 313191 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/ openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313190, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313190, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 48 llvm-static-system-libs.patch | 15 2 files changed, 63 insertions(+) Copied: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313190, openshadinglanguage/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2018-03-28 22:52:55 UTC (rev 313191) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase+pkgname=openshadinglanguage +pkgver=1.9.7 +pkgrel=1 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('ab232e45eaecb9d56938bfbd2a76999c3dc3033c31cdae3bd48f18642f98211b7255aa2a11bfda13a29100f4bfeade0643d34cb5007d23662894a48139b166e5') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + #patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DLLVM_STATIC=0 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313190, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-testing-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-testing-x86_64/llvm-static-system-libs.patch 2018-03-28 22:52:55 UTC (rev 313191) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Wednesday, February 28, 2018 @ 09:01:36 Author: arojas Revision: 299899 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 299898, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 299898, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 54 llvm-static-system-libs.patch | 15 +++ 2 files changed, 69 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 299898, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-02-28 09:01:36 UTC (rev 299899) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase+pkgname=openshadinglanguage +pkgver=1.7.6 +pkgrel=4 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm35' 'clang35') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz +llvm-static-system-libs.patch) +sha512sums=('c0f0f1aece6be0aca9751dd53063b2f3f14482d21304e0606c21f786d00adfb92025ca10c928bbc9b591a862aada0393efd62b4e27e39669e013264a2cb5c1ef' + '50f1e9a3e88b0b4e328778d4d8eb30989e1dfed0abe1bb84681dc8d368f343f3052dd975d7d500113d39f34bb8b59415c7a4e6dd841bc8d44de250a3b7f6aeec') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DLLVM_STATIC=1 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + mkdir -p "$pkgdir"/usr/share/OSL/ + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname + mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit + mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/ + mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 299898, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2018-02-28 09:01:36 UTC (rev 299899) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)
[arch-commits] Commit in openshadinglanguage/repos (3 files)
Date: Friday, December 29, 2017 @ 02:28:03 Author: svenstaro Revision: 276772 archrelease: copy trunk to community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 276771, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 276771, openshadinglanguage/trunk/llvm-static-system-libs.patch) ---+ PKGBUILD | 54 llvm-static-system-libs.patch | 15 +++ 2 files changed, 69 insertions(+) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 276771, openshadinglanguage/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-12-29 02:28:03 UTC (rev 276772) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase+pkgname=openshadinglanguage +pkgver=1.7.6 +pkgrel=3 +pkgdesc="Advanced shading language for production GI renderers" +arch=(x86_64) +url="https://github.com/imageworks/OpenShadingLanguage; +license=('custom') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' + 'libtiff' 'zlib' 'ncurses') +makedepends=('boost' 'cmake' 'llvm35' 'clang35') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz +llvm-static-system-libs.patch) +sha512sums=('c0f0f1aece6be0aca9751dd53063b2f3f14482d21304e0606c21f786d00adfb92025ca10c928bbc9b591a862aada0393efd62b4e27e39669e013264a2cb5c1ef' + '50f1e9a3e88b0b4e328778d4d8eb30989e1dfed0abe1bb84681dc8d368f343f3052dd975d7d500113d39f34bb8b59415c7a4e6dd841bc8d44de250a3b7f6aeec') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # Add system libraries needed to link against LLVM components (zlib, ncurses) + # This is required in order to statically link against LLVM + patch -Np1 < $srcdir/llvm-static-system-libs.patch +} + +build() { + cd OpenShadingLanguage-Release-$pkgver/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DLLVM_STATIC=1 \ +-DOSL_BUILD_CPP11=1 \ +-DENABLERTTI=ON \ +-DSTOP_ON_WARNING=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR="$pkgdir/" install + + mkdir -p "$pkgdir"/usr/share/OSL/ + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname + mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit + mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/ + mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders +} + +# vim:set ts=2 sw=2 et: Copied: openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 276771, openshadinglanguage/trunk/llvm-static-system-libs.patch) === --- community-staging-x86_64/llvm-static-system-libs.patch (rev 0) +++ community-staging-x86_64/llvm-static-system-libs.patch 2017-12-29 02:28:03 UTC (rev 276772) @@ -0,0 +1,15 @@ +diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake 2014-12-26 22:22:53.0 +0200 OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake 2015-03-16 03:12:56.052479730 +0200 +@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. +-execute_process (COMMAND ${LLVM_CONFIG} --libfiles ++execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) ++string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY}) + string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) + endif () + if (VERBOSE)