Date: Saturday, May 20, 2017 @ 23:20:09 Author: arojas Revision: 228819
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: openshadinglanguage/repos/community-staging-i686/ openshadinglanguage/repos/community-staging-i686/PKGBUILD (from rev 228818, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-i686/llvm-static-system-libs.patch (from rev 228818, openshadinglanguage/trunk/llvm-static-system-libs.patch) openshadinglanguage/repos/community-staging-x86_64/ openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 228818, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-staging-x86_64/llvm-static-system-libs.patch (from rev 228818, openshadinglanguage/trunk/llvm-static-system-libs.patch) --------------------------------------------------------+ community-staging-i686/PKGBUILD | 53 +++++++++++++++ community-staging-i686/llvm-static-system-libs.patch | 15 ++++ community-staging-x86_64/PKGBUILD | 53 +++++++++++++++ community-staging-x86_64/llvm-static-system-libs.patch | 15 ++++ 4 files changed, 136 insertions(+) Copied: openshadinglanguage/repos/community-staging-i686/PKGBUILD (from rev 228818, openshadinglanguage/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-05-20 23:20:09 UTC (rev 228819) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=openshadinglanguage +pkgver=1.7.5 +pkgrel=2 +pkgdesc="Advanced shading language for production GI renderers" +arch=(i686 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) +md5sums=('8b15d13c3fa510b421834d32338304c8' + 'b7c212b2549981ced03c091375f48122') + +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 \ + -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-i686/llvm-static-system-libs.patch (from rev 228818, openshadinglanguage/trunk/llvm-static-system-libs.patch) =================================================================== --- community-staging-i686/llvm-static-system-libs.patch (rev 0) +++ community-staging-i686/llvm-static-system-libs.patch 2017-05-20 23:20:09 UTC (rev 228819) @@ -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.000000000 +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) Copied: openshadinglanguage/repos/community-staging-x86_64/PKGBUILD (from rev 228818, openshadinglanguage/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-05-20 23:20:09 UTC (rev 228819) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=openshadinglanguage +pkgver=1.7.5 +pkgrel=2 +pkgdesc="Advanced shading language for production GI renderers" +arch=(i686 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) +md5sums=('8b15d13c3fa510b421834d32338304c8' + 'b7c212b2549981ced03c091375f48122') + +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 \ + -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 228818, 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-05-20 23:20:09 UTC (rev 228819) @@ -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.000000000 +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)