Date: Sunday, October 24, 2021 @ 07:52:20 Author: foutrelis Revision: 1033059
upgpkg: openshadinglanguage 1.11.14.2-2: LLVM 13 rebuild Added: openshadinglanguage/trunk/llvm13.patch Modified: openshadinglanguage/trunk/PKGBUILD --------------+ PKGBUILD | 15 ++++++++++++--- llvm13.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-24 07:47:28 UTC (rev 1033058) +++ PKGBUILD 2021-10-24 07:52:20 UTC (rev 1033059) @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> pkgname=openshadinglanguage pkgver=1.11.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced shading language for production GI renderers" arch=(x86_64) url="https://github.com/imageworks/OpenShadingLanguage"; @@ -10,9 +10,18 @@ '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=('9ff36bb25c1096f533f4776099d3508ae8af26f02d3147a85d8715c4565ab3ca4d9f208ebb046a535b8a714a9722660edc13dbcceb3a9be5c1dd8235e3b613d8') +source=($pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz + llvm13.patch) +sha512sums=('9ff36bb25c1096f533f4776099d3508ae8af26f02d3147a85d8715c4565ab3ca4d9f208ebb046a535b8a714a9722660edc13dbcceb3a9be5c1dd8235e3b613d8' + '5131ec598a4134993876a3935cf76b27acd4a05399228b547a3f71cfeeb5462e8044c91c04b8d254fddb12b22be9dc3a9e035baa79db9c5eb086cc4c56b438eb') +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1412 + patch -Np1 -i ../llvm13.patch +} + build() { cd OpenShadingLanguage-Release-$pkgver Added: llvm13.patch =================================================================== --- llvm13.patch (rev 0) +++ llvm13.patch 2021-10-24 07:52:20 UTC (rev 1033059) @@ -0,0 +1,48 @@ +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(
