[arch-commits] Commit in openshadinglanguage/repos/community-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Thu Oct 1 18:02:09 UTC 2020


    Date: Thursday, October 1, 2020 @ 18:02:09
  Author: svenstaro
Revision: 714243

archrelease: copy trunk to community-x86_64

Added:
  openshadinglanguage/repos/community-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch
    (from rev 714242, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch)
  openshadinglanguage/repos/community-x86_64/PKGBUILD
    (from rev 714242, openshadinglanguage/trunk/PKGBUILD)
Deleted:
  openshadinglanguage/repos/community-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch
  openshadinglanguage/repos/community-x86_64/PKGBUILD

-----------------------------------------------------+
 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch |  170 +++++++++---------
 PKGBUILD                                            |   76 ++++----
 2 files changed, 123 insertions(+), 123 deletions(-)

Deleted: 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch
===================================================================
--- 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch	2020-10-01 18:02:03 UTC (rev 714242)
+++ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch	2020-10-01 18:02:09 UTC (rev 714243)
@@ -1,85 +0,0 @@
-From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001
-From: Christopher Kulla <fpsunflower at users.noreply.github.com>
-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-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 714242, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch)
===================================================================
--- 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch	                        (rev 0)
+++ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch	2020-10-01 18:02:09 UTC (rev 714243)
@@ -0,0 +1,85 @@
+From 2f9093ed2aedc008ba6e0a0b3ba0ff1839d73ac1 Mon Sep 17 00:00:00 2001
+From: Christopher Kulla <fpsunflower at users.noreply.github.com>
+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);

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-01 18:02:03 UTC (rev 714242)
+++ PKGBUILD	2020-10-01 18:02:09 UTC (rev 714243)
@@ -1,38 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-pkgname=openshadinglanguage
-pkgver=1.11.7.3
-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' 'clang')
-makedepends=('boost' 'cmake' 'python' 'llvm' 'ninja')
-optdepends=('python: the Python module')
-source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-sha512sums=('8033e0c25addd719435564a6ab243bab310fb78e1e8419b615ac2feb7d655275f79346c0527034a38753de5b49a0869d9b011549e1c0386a4d43f5e268d2f2c1')
-
-build() {
-  cd OpenShadingLanguage-Release-$pkgver
-
-  cmake . \
-    -B build \
-    -GNinja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_CXX_STANDARD=14 \
-    -DLLVM_STATIC=0 \
-    -DSTOP_ON_WARNING=OFF
-  ninja -C build
-}
-
-package() {
-  cd OpenShadingLanguage-Release-$pkgver
-
-  DESTDIR="$pkgdir/" ninja -C build install
-
-  install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.md
-}
-
-# vim:set ts=2 sw=2 et:

Copied: openshadinglanguage/repos/community-x86_64/PKGBUILD (from rev 714242, openshadinglanguage/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-01 18:02:09 UTC (rev 714243)
@@ -0,0 +1,38 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+pkgname=openshadinglanguage
+pkgver=1.11.8.0
+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' 'clang')
+makedepends=('boost' 'cmake' 'python' 'llvm' 'ninja')
+optdepends=('python: the Python module')
+source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
+sha512sums=('b0e0caf0eb4f660538c48ee1a87ce1fe031123327bca3d98df9256ecb5f032caf08da78436c2ac7b23d73e10a35e43be6ab323a1b2212d4b8a614f9ab3c9f8e6')
+
+build() {
+  cd OpenShadingLanguage-Release-$pkgver
+
+  cmake . \
+    -B build \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_CXX_STANDARD=14 \
+    -DLLVM_STATIC=0 \
+    -DSTOP_ON_WARNING=OFF
+  ninja -C build
+}
+
+package() {
+  cd OpenShadingLanguage-Release-$pkgver
+
+  DESTDIR="$pkgdir/" ninja -C build install
+
+  install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.md
+}
+
+# vim:set ts=2 sw=2 et:


More information about the arch-commits mailing list