[arch-commits] Commit in openshadinglanguage/repos (8 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Apr 29 01:53:14 UTC 2015
Date: Wednesday, April 29, 2015 @ 03:53:14
Author: svenstaro
Revision: 132482
archrelease: copy trunk to community-i686, community-x86_64
Added:
openshadinglanguage/repos/community-i686/PKGBUILD
(from rev 132481, openshadinglanguage/trunk/PKGBUILD)
openshadinglanguage/repos/community-i686/llvm-static-system-libs.patch
(from rev 132481, openshadinglanguage/trunk/llvm-static-system-libs.patch)
openshadinglanguage/repos/community-x86_64/PKGBUILD
(from rev 132481, openshadinglanguage/trunk/PKGBUILD)
openshadinglanguage/repos/community-x86_64/llvm-static-system-libs.patch
(from rev 132481, openshadinglanguage/trunk/llvm-static-system-libs.patch)
Deleted:
openshadinglanguage/repos/community-i686/PKGBUILD
openshadinglanguage/repos/community-i686/llvm-static-system-libs.patch
openshadinglanguage/repos/community-x86_64/PKGBUILD
openshadinglanguage/repos/community-x86_64/llvm-static-system-libs.patch
------------------------------------------------+
/PKGBUILD | 114 +++++++++++++++++++++++
/llvm-static-system-libs.patch | 30 ++++++
community-i686/PKGBUILD | 57 -----------
community-i686/llvm-static-system-libs.patch | 15 ---
community-x86_64/PKGBUILD | 57 -----------
community-x86_64/llvm-static-system-libs.patch | 15 ---
6 files changed, 144 insertions(+), 144 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-04-29 01:53:08 UTC (rev 132481)
+++ community-i686/PKGBUILD 2015-04-29 01:53:14 UTC (rev 132482)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=openshadinglanguage
-pkgver=1.5.12
-pkgrel=5
-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' 'clang35' 'llvm35')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
- llvm-static-system-libs.patch
- alignment.patch::https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91.patch)
-md5sums=('484752a0f97df55962c3a667075deddc'
- 'b7c212b2549981ced03c091375f48122'
- 'f3f24c2aa7f5aabd98c0967747b58ecc')
-
-prepare() {
- cd OpenShadingLanguage-Release-$pkgver
- patch -Np1 < $srcdir/alignment.patch
-
- # 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
-
- cd src
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- cmake ../.. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLLVM_STATIC=1 \
- -DCMAKE_CXX_FLAGS="-Wno-error=array-bounds -std=c++11"
- 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-i686/PKGBUILD (from rev 132481, openshadinglanguage/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-04-29 01:53:14 UTC (rev 132482)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=openshadinglanguage
+pkgver=1.5.12
+pkgrel=6
+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' 'clang35' 'llvm35')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+ llvm-static-system-libs.patch
+ alignment.patch::https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91.patch)
+md5sums=('484752a0f97df55962c3a667075deddc'
+ 'b7c212b2549981ced03c091375f48122'
+ 'f3f24c2aa7f5aabd98c0967747b58ecc')
+
+prepare() {
+ cd OpenShadingLanguage-Release-$pkgver
+ patch -Np1 < $srcdir/alignment.patch
+
+ # 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
+
+ cd src
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake ../.. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLLVM_STATIC=1 \
+ -DCMAKE_CXX_FLAGS="-Wno-error=array-bounds -std=c++11"
+ 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:
Deleted: community-i686/llvm-static-system-libs.patch
===================================================================
--- community-i686/llvm-static-system-libs.patch 2015-04-29 01:53:08 UTC (rev 132481)
+++ community-i686/llvm-static-system-libs.patch 2015-04-29 01:53:14 UTC (rev 132482)
@@ -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-i686/llvm-static-system-libs.patch (from rev 132481, openshadinglanguage/trunk/llvm-static-system-libs.patch)
===================================================================
--- community-i686/llvm-static-system-libs.patch (rev 0)
+++ community-i686/llvm-static-system-libs.patch 2015-04-29 01:53:14 UTC (rev 132482)
@@ -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)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-04-29 01:53:08 UTC (rev 132481)
+++ community-x86_64/PKGBUILD 2015-04-29 01:53:14 UTC (rev 132482)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=openshadinglanguage
-pkgver=1.5.12
-pkgrel=5
-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' 'clang35' 'llvm35')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
- llvm-static-system-libs.patch
- alignment.patch::https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91.patch)
-md5sums=('484752a0f97df55962c3a667075deddc'
- 'b7c212b2549981ced03c091375f48122'
- 'f3f24c2aa7f5aabd98c0967747b58ecc')
-
-prepare() {
- cd OpenShadingLanguage-Release-$pkgver
- patch -Np1 < $srcdir/alignment.patch
-
- # 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
-
- cd src
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- cmake ../.. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLLVM_STATIC=1 \
- -DCMAKE_CXX_FLAGS="-Wno-error=array-bounds -std=c++11"
- 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-x86_64/PKGBUILD (from rev 132481, openshadinglanguage/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-04-29 01:53:14 UTC (rev 132482)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=openshadinglanguage
+pkgver=1.5.12
+pkgrel=6
+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' 'clang35' 'llvm35')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+ llvm-static-system-libs.patch
+ alignment.patch::https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91.patch)
+md5sums=('484752a0f97df55962c3a667075deddc'
+ 'b7c212b2549981ced03c091375f48122'
+ 'f3f24c2aa7f5aabd98c0967747b58ecc')
+
+prepare() {
+ cd OpenShadingLanguage-Release-$pkgver
+ patch -Np1 < $srcdir/alignment.patch
+
+ # 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
+
+ cd src
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake ../.. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLLVM_STATIC=1 \
+ -DCMAKE_CXX_FLAGS="-Wno-error=array-bounds -std=c++11"
+ 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:
Deleted: community-x86_64/llvm-static-system-libs.patch
===================================================================
--- community-x86_64/llvm-static-system-libs.patch 2015-04-29 01:53:08 UTC (rev 132481)
+++ community-x86_64/llvm-static-system-libs.patch 2015-04-29 01:53:14 UTC (rev 132482)
@@ -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 132481, openshadinglanguage/trunk/llvm-static-system-libs.patch)
===================================================================
--- community-x86_64/llvm-static-system-libs.patch (rev 0)
+++ community-x86_64/llvm-static-system-libs.patch 2015-04-29 01:53:14 UTC (rev 132482)
@@ -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