Date: Sunday, October 6, 2019 @ 10:22:53 Author: foutrelis Revision: 513203
upgpkg: openshadinglanguage 1.10.6-3 LLVM 9 rebuild. Added: openshadinglanguage/trunk/llvm9.patch Modified: openshadinglanguage/trunk/PKGBUILD -------------+ PKGBUILD | 13 ++++++++++--- llvm9.patch | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-06 10:15:52 UTC (rev 513202) +++ PKGBUILD 2019-10-06 10:22:53 UTC (rev 513203) @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> pkgname=openshadinglanguage pkgver=1.10.6 -pkgrel=2 +pkgrel=3 pkgdesc="Advanced shading language for production GI renderers" arch=(x86_64) url="https://github.com/imageworks/OpenShadingLanguage" @@ -9,9 +9,16 @@ depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'zlib' 'ncurses') makedepends=('boost' 'cmake' 'python' 'llvm' 'clang') -source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) -sha512sums=('5d3a735fa33bfebdba9082345dcfeb89c17e876c9958d8af78f4e2150153062013a88644fc612b5778236eebb16a5ebae9a6d0adb4ff1e152a5c451905220481') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz + llvm9.patch) +sha512sums=('5d3a735fa33bfebdba9082345dcfeb89c17e876c9958d8af78f4e2150153062013a88644fc612b5778236eebb16a5ebae9a6d0adb4ff1e152a5c451905220481' + 'a52e0c103da6c800115f7140b3d29b78e20cb1a6a704bfe7440c50f1e398997dfd77723bfa9d6001aea7d2a249c3ebcbda3e94ea3ad512830f012a0b0b4bd77b') +prepare() { + cd OpenShadingLanguage-Release-$pkgver + patch -Np1 -i ../llvm9.patch +} + build() { cd OpenShadingLanguage-Release-$pkgver/src Added: llvm9.patch =================================================================== --- llvm9.patch (rev 0) +++ llvm9.patch 2019-10-06 10:22:53 UTC (rev 513203) @@ -0,0 +1,22 @@ +From 00984c339f524319b38786710528fecbeb1397a1 Mon Sep 17 00:00:00 2001 +From: Larry Gritz <l...@larrygritz.com> +Date: Thu, 12 Sep 2019 13:11:27 -0700 +Subject: [PATCH] LLVM 9 / clang 9 compatibility (#1058) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index 1746ec628..838df1e21 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -682,7 +682,12 @@ LLVM_Util::make_function (const std::string &name, bool fastcall, + bool varargs) + { + llvm::FunctionType *functype = type_function (rettype, params, varargs); ++#if OSL_LLVM_VERSION >= 90 ++ auto funccallee = module()->getOrInsertFunction(name, functype); ++ llvm::Value* c = funccallee.getCallee(); ++#else + llvm::Constant *c = module()->getOrInsertFunction (name, functype); ++#endif + ASSERT (c && "getOrInsertFunction returned NULL"); + ASSERT_MSG (llvm::isa<llvm::Function>(c), + "Declaration for %s is wrong, LLVM had to make a cast", name.c_str());