diff --git a/0001-LLVM-12-compatibility-fixes.patch b/0001-LLVM-12-compatibility-fixes.patch new file mode 100644 index 0000000..f711f34 --- /dev/null +++ b/0001-LLVM-12-compatibility-fixes.patch @@ -0,0 +1,82 @@ +From d3ef2dbd517447066710e3bf148b43d8bab3e75d Mon Sep 17 00:00:00 2001 +From: Euan Haahr +Date: Fri, 5 Feb 2021 22:51:14 +0000 +Subject: [PATCH 1/2] Removed use of options.PrintMachineCode since this has + been removed as of llvm 12. Converted uses of DebugLoc::get to + DILocation::get since it has been depricated and remove as of llvm 12. + +Signed-off-by: Euan Haahr +--- + src/liboslexec/llvm_util.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index fed8c5ecb..c3a3dc5e1 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -701,7 +701,8 @@ LLVM_Util::debug_pop_function() + // that has been finalized, point it back to the compilation unit + OSL_ASSERT(m_builder); + OSL_ASSERT(m_builder->getCurrentDebugLocation().get() != nullptr); +- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast(1), ++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(), ++ static_cast(1), + static_cast(0), /* column? we don't know it, may be worth tracking through osl->oso*/ + getCurrentDebugScope())); + +@@ -776,7 +777,8 @@ LLVM_Util::debug_set_location(ustring sourcefile, int sourceline) + } + if (newDebugLocation) { + llvm::DebugLoc debug_location = +- llvm::DebugLoc::get(static_cast(sourceline), ++ llvm::DILocation::get(sp->getContext(), ++ static_cast(sourceline), + static_cast(0), /* column? we don't know it, may be worth tracking through osl->oso*/ + sp, + inlineSite); +@@ -958,7 +960,8 @@ LLVM_Util::new_builder (llvm::BasicBlock *block) + m_builder = new IRBuilder (block); + if (this->debug_is_enabled()) { + OSL_ASSERT(getCurrentDebugScope()); +- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast(1), ++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(), ++ static_cast(1), + static_cast(0), /* column? we don't know it, may be worth tracking through osl->oso*/ + getCurrentDebugScope())); + } +@@ -1386,7 +1389,6 @@ LLVM_Util::make_jit_execengine (std::string *err, + options.RelaxELFRelocations = false; + //options.DebuggerTuning = llvm::DebuggerKind::GDB; + +- options.PrintMachineCode = dumpasm(); + engine_builder.setTargetOptions(options); + + detect_cpu_features(requestedISA, !jit_fma()); + +From b5c65e13101d60fdf63839b2ef19154bfbc3a45c Mon Sep 17 00:00:00 2001 +From: Euan Haahr +Date: Sat, 6 Feb 2021 01:02:53 +0000 +Subject: [PATCH 2/2] PrintMachine code will only be used if llvm is lower than + version 12 + +Signed-off-by: Euan Haahr +--- + src/liboslexec/llvm_util.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index c3a3dc5e1..07e7fb6af 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -1389,6 +1389,11 @@ LLVM_Util::make_jit_execengine (std::string *err, + options.RelaxELFRelocations = false; + //options.DebuggerTuning = llvm::DebuggerKind::GDB; + ++ // TODO: Find equivalent function for PrintMachineCode post LLVM 12 ++ #if OSL_LLVM_VERSION < 120 ++ options.PrintMachineCode = dumpasm(); ++ #endif ++ + engine_builder.setTargetOptions(options); + + detect_cpu_features(requestedISA, !jit_fma()); diff --git a/OpenShadingLanguage-1.11.12.0.tar.gz b/OpenShadingLanguage-1.11.12.0.tar.gz deleted file mode 100644 index 4417375..0000000 --- a/OpenShadingLanguage-1.11.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8d568ea657f63c18e0057e40e910a19f526af0e4b63e3de8a7041dbce511c19 -size 14141817 diff --git a/OpenShadingLanguage-1.11.13.0.tar.gz b/OpenShadingLanguage-1.11.13.0.tar.gz new file mode 100644 index 0000000..9156b0c --- /dev/null +++ b/OpenShadingLanguage-1.11.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de192571b1b0cb182f108832a9d2acf5682f46248ed3ecc0464d787ccfc097cf +size 14142105 diff --git a/OpenShadingLanguage.changes b/OpenShadingLanguage.changes index dbc4c43..c808220 100644 --- a/OpenShadingLanguage.changes +++ b/OpenShadingLanguage.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun May 2 05:54:38 UTC 2021 - munix9@googlemail.com + +- Update to version 1.11.13 + + Updated vector2.h with a mod(vector2,vector2) function. #1312 + + Fix unnecesary error messages to stderr when encountering + broken point clouds. #1333 + +- Add 0001-LLVM-12-compatibility-fixes.patch + ------------------------------------------------------------------- Wed Apr 7 22:16:17 UTC 2021 - Dirk Müller diff --git a/OpenShadingLanguage.spec b/OpenShadingLanguage.spec index 02f556b..dded37f 100644 --- a/OpenShadingLanguage.spec +++ b/OpenShadingLanguage.spec @@ -23,7 +23,7 @@ %define oiio_major_minor_ver %(rpm -q --queryformat='%%{version}' OpenImageIO-devel | cut -d . -f 1-2) Name: OpenShadingLanguage -Version: 1.11.12.0 +Version: 1.11.13.0 Release: 0 Summary: A language for programmable shading License: BSD-3-Clause @@ -31,6 +31,9 @@ Group: Productivity/Graphics/Other URL: https://github.com/imageworks/OpenShadingLanguage Source0: https://github.com/imageworks/OpenShadingLanguage/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://creativecommons.org/licenses/by/3.0/legalcode.txt#/CC-BY-3.0.txt +# PATCH-FIX-UPSTREAM 0001-LLVM-12-compatibility-fixes.patch +# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1331 +Patch0: 0001-LLVM-12-compatibility-fixes.patch BuildRequires: OpenEXR-devel BuildRequires: bison BuildRequires: clang-devel >= 7 @@ -190,7 +193,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -n %{name}-Release-%{version} +%autosetup -n %{name}-Release-%{version} -p1 find . -iname CMakeLists.txt -exec sed "-i" "-e s/COMMAND python/COMMAND python3/" "{}" \; %build