[arch-commits] Commit in openshadinglanguage/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Tue Jun 5 19:07:46 UTC 2018
Date: Tuesday, June 5, 2018 @ 19:07:45
Author: svenstaro
Revision: 340614
archrelease: copy trunk to community-x86_64
Added:
openshadinglanguage/repos/community-x86_64/PKGBUILD
(from rev 340613, openshadinglanguage/trunk/PKGBUILD)
openshadinglanguage/repos/community-x86_64/llvm-static-system-libs.patch
(from rev 340613, 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 | 98 ++++++++++++++++++++--------------------
llvm-static-system-libs.patch | 30 ++++++------
2 files changed, 65 insertions(+), 63 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 19:06:02 UTC (rev 340613)
+++ PKGBUILD 2018-06-05 19:07:45 UTC (rev 340614)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=openshadinglanguage
-pkgver=1.9.9
-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=('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-x86_64/PKGBUILD (from rev 340613, openshadinglanguage/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-05 19:07:45 UTC (rev 340614)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=openshadinglanguage
+pkgver=1.9.9
+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=('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-05 19:06:02 UTC (rev 340613)
+++ llvm-static-system-libs.patch 2018-06-05 19:07:45 UTC (rev 340614)
@@ -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 340613, openshadinglanguage/trunk/llvm-static-system-libs.patch)
===================================================================
--- llvm-static-system-libs.patch (rev 0)
+++ llvm-static-system-libs.patch 2018-06-05 19:07:45 UTC (rev 340614)
@@ -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)
More information about the arch-commits
mailing list