[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Wednesday, May 13, 2020 @ 22:52:50 Author: svenstaro Revision: 627798 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 627797, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 627797, openshadinglanguage/trunk/PKGBUILD) Deleted: openshadinglanguage/repos/community-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch openshadinglanguage/repos/community-testing-x86_64/PKGBUILD -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 170 +- PKGBUILD| 83 2 files changed, 126 insertions(+), 127 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-05-13 22:52:43 UTC (rev 627797) +++ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-05-13 22:52:50 UTC (rev 627798) @@ -1,85 +0,0 @@ -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-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 627797, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch)
[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Wednesday, May 13, 2020 @ 22:35:28 Author: svenstaro Revision: 627794 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 627793, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch) openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 627793, openshadinglanguage/trunk/PKGBUILD) Deleted: openshadinglanguage/repos/community-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch openshadinglanguage/repos/community-testing-x86_64/PKGBUILD -+ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch | 170 +- PKGBUILD| 88 - 2 files changed, 127 insertions(+), 131 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-05-13 22:35:21 UTC (rev 627793) +++ 0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch 2020-05-13 22:35:28 UTC (rev 627794) @@ -1,85 +0,0 @@ -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-testing-x86_64/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch (from rev 627793, openshadinglanguage/trunk/0001-Allow-OSL-to-compile-with-LLVM-10.x-1128.patch)
[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Friday, September 21, 2018 @ 18:34:12 Author: foutrelis Revision: 383867 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 383866, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 383866, openshadinglanguage/trunk/llvm-static-system-libs.patch) Deleted: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch ---+ PKGBUILD | 96 llvm-static-system-libs.patch | 30 ++-- 2 files changed, 63 insertions(+), 63 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-09-21 18:34:01 UTC (rev 383866) +++ PKGBUILD2018-09-21 18:34:12 UTC (rev 383867) @@ -1,48 +0,0 @@ -# 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-testing-x86_64/PKGBUILD (from rev 383866, openshadinglanguage/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-09-21 18:34:12 UTC (rev 383867) @@ -0,0 +1,48 @@ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.10 +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' 'python' 'llvm' 'clang') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) +sha512sums=('61c52cb673863bd67e257aef2c37026a49c392de9a41739e07926f8dd878f6c90ac2da6224eb3f78b8ba8e6ca121502ba41c65a6c3353f3cb7fec631a43f016b') + +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: Deleted: llvm-static-system-libs.patch === --- llvm-static-system-libs.patch 2018-09-21 18:34:01 UTC (rev 383866) +++ llvm-static-system-libs.patch 2018-09-21 18:34:12 UTC (rev 383867) @@ -1,15 +0,0 @@ -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 -+++
[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Thursday, June 7, 2018 @ 20:03:37 Author: svenstaro Revision: 341898 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 341897, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 341897, openshadinglanguage/trunk/llvm-static-system-libs.patch) Deleted: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch ---+ PKGBUILD | 98 llvm-static-system-libs.patch | 30 ++-- 2 files changed, 65 insertions(+), 63 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-06-07 20:03:30 UTC (rev 341897) +++ PKGBUILD2018-06-07 20:03:37 UTC (rev 341898) @@ -1,48 +0,0 @@ -# $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-testing-x86_64/PKGBUILD (from rev 341897, openshadinglanguage/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-06-07 20:03:37 UTC (rev 341898) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.9 +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' '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: Deleted: llvm-static-system-libs.patch === --- llvm-static-system-libs.patch 2018-06-07 20:03:30 UTC (rev 341897) +++ llvm-static-system-libs.patch 2018-06-07 20:03:37 UTC (rev 341898) @@ -1,15 +0,0 @@ -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
[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Thursday, March 29, 2018 @ 13:26:35 Author: svenstaro Revision: 313387 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313386, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313386, openshadinglanguage/trunk/llvm-static-system-libs.patch) Deleted: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch ---+ PKGBUILD | 96 llvm-static-system-libs.patch | 30 ++-- 2 files changed, 63 insertions(+), 63 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-03-29 13:26:26 UTC (rev 313386) +++ PKGBUILD2018-03-29 13:26:35 UTC (rev 313387) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase-pkgname=openshadinglanguage -pkgver=1.9.7 -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' '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/PKGBUILD (from rev 313386, openshadinglanguage/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-03-29 13:26:35 UTC (rev 313387) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.7 +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=('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: Deleted: llvm-static-system-libs.patch === --- llvm-static-system-libs.patch 2018-03-29 13:26:26 UTC (rev 313386) +++ llvm-static-system-libs.patch 2018-03-29 13:26:35 UTC (rev 313387) @@ -1,15 +0,0 @@ -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
[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Date: Thursday, March 29, 2018 @ 04:54:47 Author: svenstaro Revision: 313242 archrelease: copy trunk to community-testing-x86_64 Added: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 313241, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch (from rev 313241, openshadinglanguage/trunk/llvm-static-system-libs.patch) Deleted: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD openshadinglanguage/repos/community-testing-x86_64/llvm-static-system-libs.patch ---+ PKGBUILD | 96 llvm-static-system-libs.patch | 30 ++-- 2 files changed, 63 insertions(+), 63 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-03-29 04:54:39 UTC (rev 313241) +++ PKGBUILD2018-03-29 04:54:47 UTC (rev 313242) @@ -1,48 +0,0 @@ -# $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/PKGBUILD (from rev 313241, openshadinglanguage/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-03-29 04:54:47 UTC (rev 313242) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +pkgname=openshadinglanguage +pkgver=1.9.7 +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' '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: Deleted: llvm-static-system-libs.patch === --- llvm-static-system-libs.patch 2018-03-29 04:54:39 UTC (rev 313241) +++ llvm-static-system-libs.patch 2018-03-29 04:54:47 UTC (rev 313242) @@ -1,15 +0,0 @@ -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