Date: Wednesday, June 22, 2022 @ 22:36:47 Author: foutrelis Revision: 1239189
upgpkg: openshadinglanguage 1.11.17.0-4: LLVM 14 rebuild Added: openshadinglanguage/trunk/llvm14.patch Modified: openshadinglanguage/trunk/PKGBUILD Deleted: openshadinglanguage/trunk/llvm13.patch --------------+ PKGBUILD | 13 ++++++++++--- llvm13.patch | 48 ------------------------------------------------ llvm14.patch | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 51 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-22 22:03:56 UTC (rev 1239188) +++ PKGBUILD 2022-06-22 22:36:47 UTC (rev 1239189) @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> pkgname=openshadinglanguage pkgver=1.11.17.0 -pkgrel=3 +pkgrel=4 pkgdesc="Advanced shading language for production GI renderers" arch=(x86_64) url="https://github.com/imageworks/OpenShadingLanguage"; @@ -10,9 +10,16 @@ '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=('14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2') +source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz + llvm14.patch) +sha512sums=('14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2' + 'eb7036e6bacab49508d8d55ce2fcc923527bf79e46451ce17261c18b36dae64a67f7be356bf0ac91e52cc6381a42778aff37f4d7b626232d79eb739d8773fa44') +prepare() { + cd OpenShadingLanguage-Release-$pkgver + patch -Np1 -i ../llvm14.patch +} + build() { cd OpenShadingLanguage-Release-$pkgver Deleted: llvm13.patch =================================================================== --- llvm13.patch 2022-06-22 22:03:56 UTC (rev 1239188) +++ llvm13.patch 2022-06-22 22:36:47 UTC (rev 1239189) @@ -1,48 +0,0 @@ -From 8682211d0bfe5c4be63a4a003d06037ff9721e66 Mon Sep 17 00:00:00 2001 -From: Luya Tshimbalanga <[email protected]> -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 <[email protected]> ---- - 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( Added: llvm14.patch =================================================================== --- llvm14.patch (rev 0) +++ llvm14.patch 2022-06-22 22:36:47 UTC (rev 1239189) @@ -0,0 +1,16 @@ +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 45e0b3e4..96651f00 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -37,7 +37,11 @@ + #include <llvm/Support/raw_os_ostream.h> + #include <llvm/IR/LegacyPassManager.h> + #include <llvm/IR/ValueSymbolTable.h> ++#if OSL_LLVM_VERSION < 140 + #include <llvm/Support/TargetRegistry.h> ++#else ++#include <llvm/MC/TargetRegistry.h> ++#endif + + #include <llvm/Bitcode/BitcodeReader.h> + #include <llvm/Bitcode/BitcodeWriter.h>
