Date: Thursday, March 29, 2018 @ 12:47:59 Author: svenstaro Revision: 313382
archrelease: copy trunk to community-x86_64 Added: openshadinglanguage/repos/community-x86_64/PKGBUILD (from rev 313381, openshadinglanguage/trunk/PKGBUILD) openshadinglanguage/repos/community-x86_64/llvm-static-system-libs.patch (from rev 313381, openshadinglanguage/trunk/llvm-static-system-libs.patch) Deleted: openshadinglanguage/repos/community-x86_64/PKGBUILD openshadinglanguage/repos/community-x86_64/llvm-static-system-libs.patch -------------------------------+ PKGBUILD | 96 ++++++++++++++++++++-------------------- llvm-static-system-libs.patch | 30 ++++++------ 2 files changed, 63 insertions(+), 63 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-29 12:47:42 UTC (rev 313381) +++ PKGBUILD 2018-03-29 12:47:59 UTC (rev 313382) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -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-x86_64/PKGBUILD (from rev 313381, openshadinglanguage/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-29 12:47:59 UTC (rev 313382) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=openshadinglanguage +pkgver=1.9.7 +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=('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 12:47:42 UTC (rev 313381) +++ llvm-static-system-libs.patch 2018-03-29 12:47:59 UTC (rev 313382) @@ -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.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-x86_64/llvm-static-system-libs.patch (from rev 313381, openshadinglanguage/trunk/llvm-static-system-libs.patch) =================================================================== --- llvm-static-system-libs.patch (rev 0) +++ llvm-static-system-libs.patch 2018-03-29 12:47:59 UTC (rev 313382) @@ -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)