[arch-commits] Commit in openshadinglanguage/repos/community-testing-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Tue Nov 2 03:10:30 UTC 2021
Date: Tuesday, November 2, 2021 @ 03:10:30
Author: svenstaro
Revision: 1035376
archrelease: copy trunk to community-testing-x86_64
Added:
openshadinglanguage/repos/community-testing-x86_64/PKGBUILD
(from rev 1035375, openshadinglanguage/trunk/PKGBUILD)
openshadinglanguage/repos/community-testing-x86_64/llvm13.patch
(from rev 1035375, openshadinglanguage/trunk/llvm13.patch)
Deleted:
openshadinglanguage/repos/community-testing-x86_64/PKGBUILD
openshadinglanguage/repos/community-testing-x86_64/llvm13.patch
--------------+
PKGBUILD | 85 ++++++++++++++++++++++----------------------------
llvm13.patch | 96 ++++++++++++++++++++++++++++-----------------------------
2 files changed, 86 insertions(+), 95 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-11-02 03:10:19 UTC (rev 1035375)
+++ PKGBUILD 2021-11-02 03:10:30 UTC (rev 1035376)
@@ -1,47 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-pkgname=openshadinglanguage
-pkgver=1.11.15.0
-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' 'imath' 'freetype2' 'libpng'
- 'libtiff' 'zlib' 'ncurses' 'clang')
-makedepends=('boost' 'cmake' 'python' 'llvm' 'ninja')
-optdepends=('python: the Python module')
-source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
- llvm13.patch)
-sha512sums=('d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5'
- '5131ec598a4134993876a3935cf76b27acd4a05399228b547a3f71cfeeb5462e8044c91c04b8d254fddb12b22be9dc3a9e035baa79db9c5eb086cc4c56b438eb')
-
-prepare() {
- cd OpenShadingLanguage-Release-$pkgver
-
- # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1412
- patch -Np1 -i ../llvm13.patch
-}
-
-build() {
- cd OpenShadingLanguage-Release-$pkgver
-
- cmake \
- -B build \
- -GNinja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_CXX_STANDARD=14 \
- -DLLVM_STATIC=0 \
- -DSTOP_ON_WARNING=OFF
- ninja -C build
-}
-
-package() {
- cd OpenShadingLanguage-Release-$pkgver
-
- DESTDIR="$pkgdir/" ninja -C build install
-
- install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.md
-}
-
-# vim:set ts=2 sw=2 et:
Copied: openshadinglanguage/repos/community-testing-x86_64/PKGBUILD (from rev 1035375, openshadinglanguage/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-11-02 03:10:30 UTC (rev 1035376)
@@ -0,0 +1,38 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+pkgname=openshadinglanguage
+pkgver=1.11.16.0
+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' 'imath' 'freetype2' 'libpng'
+ 'libtiff' 'zlib' 'ncurses' 'clang')
+makedepends=('boost' 'cmake' 'python' 'llvm' 'ninja')
+optdepends=('python: the Python module')
+source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
+sha512sums=('717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b')
+
+build() {
+ cd OpenShadingLanguage-Release-$pkgver
+
+ cmake \
+ -B build \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_CXX_STANDARD=14 \
+ -DLLVM_STATIC=0 \
+ -DSTOP_ON_WARNING=OFF
+ ninja -C build
+}
+
+package() {
+ cd OpenShadingLanguage-Release-$pkgver
+
+ DESTDIR="$pkgdir/" ninja -C build install
+
+ install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.md
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: llvm13.patch
===================================================================
--- llvm13.patch 2021-11-02 03:10:19 UTC (rev 1035375)
+++ llvm13.patch 2021-11-02 03:10:30 UTC (rev 1035376)
@@ -1,48 +0,0 @@
-From 8682211d0bfe5c4be63a4a003d06037ff9721e66 Mon Sep 17 00:00:00 2001
-From: Luya Tshimbalanga <luya at fedoraproject.org>
-Date: Tue, 28 Sep 2021 10:08:01 -0700
-Subject: [PATCH] Fix compatibility with LLVM 12 and up (#1412)
-
-Upstream LLVM stopped using the compatibility
-spellings of OF_{None,Text,Append} from version 12 and up.
-
-https://reviews.llvm.org/D101650
-
-Signed-off-by: Luya Tshimbalanga <luya at fedoraproject.org>
----
- src/liboslexec/llvm_util.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 4bd0dca35..4d0e1752d 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -1407,7 +1407,9 @@ LLVM_Util::make_jit_execengine (std::string *err,
-
- options.NoZerosInBSS = false;
- options.GuaranteedTailCallOpt = false;
-+#if OSL_LLVM_VERSION < 120
- options.StackAlignmentOverride = 0;
-+#endif
- options.FunctionSections = true;
- options.UseInitArray = false;
- options.FloatABIType = llvm::FloatABI::Default;
-@@ -5385,7 +5387,7 @@ void
- LLVM_Util::write_bitcode_file (const char *filename, std::string *err)
- {
- std::error_code local_error;
-- llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::F_None);
-+ llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::OF_None);
- if (! out.has_error()) {
- llvm::WriteBitcodeToFile (*module(), out);
- if (err && local_error)
-@@ -5447,7 +5449,9 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name,
- options.AllowFPOpFusion = llvm::FPOpFusion::Fast;
- options.NoZerosInBSS = 0;
- options.GuaranteedTailCallOpt = 0;
-+#if OSL_LLVM_VERSION < 120
- options.StackAlignmentOverride = 0;
-+#endif
- options.UseInitArray = 0;
-
- llvm::TargetMachine* target_machine = llvm_target->createTargetMachine(
Copied: openshadinglanguage/repos/community-testing-x86_64/llvm13.patch (from rev 1035375, openshadinglanguage/trunk/llvm13.patch)
===================================================================
--- llvm13.patch (rev 0)
+++ llvm13.patch 2021-11-02 03:10:30 UTC (rev 1035376)
@@ -0,0 +1,48 @@
+From 8682211d0bfe5c4be63a4a003d06037ff9721e66 Mon Sep 17 00:00:00 2001
+From: Luya Tshimbalanga <luya at fedoraproject.org>
+Date: Tue, 28 Sep 2021 10:08:01 -0700
+Subject: [PATCH] Fix compatibility with LLVM 12 and up (#1412)
+
+Upstream LLVM stopped using the compatibility
+spellings of OF_{None,Text,Append} from version 12 and up.
+
+https://reviews.llvm.org/D101650
+
+Signed-off-by: Luya Tshimbalanga <luya at fedoraproject.org>
+---
+ src/liboslexec/llvm_util.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 4bd0dca35..4d0e1752d 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -1407,7 +1407,9 @@ LLVM_Util::make_jit_execengine (std::string *err,
+
+ options.NoZerosInBSS = false;
+ options.GuaranteedTailCallOpt = false;
++#if OSL_LLVM_VERSION < 120
+ options.StackAlignmentOverride = 0;
++#endif
+ options.FunctionSections = true;
+ options.UseInitArray = false;
+ options.FloatABIType = llvm::FloatABI::Default;
+@@ -5385,7 +5387,7 @@ void
+ LLVM_Util::write_bitcode_file (const char *filename, std::string *err)
+ {
+ std::error_code local_error;
+- llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::F_None);
++ llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::OF_None);
+ if (! out.has_error()) {
+ llvm::WriteBitcodeToFile (*module(), out);
+ if (err && local_error)
+@@ -5447,7 +5449,9 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name,
+ options.AllowFPOpFusion = llvm::FPOpFusion::Fast;
+ options.NoZerosInBSS = 0;
+ options.GuaranteedTailCallOpt = 0;
++#if OSL_LLVM_VERSION < 120
+ options.StackAlignmentOverride = 0;
++#endif
+ options.UseInitArray = 0;
+
+ llvm::TargetMachine* target_machine = llvm_target->createTargetMachine(
More information about the arch-commits
mailing list