Accepting request 915143 from home:frispete:blender
- Update to version 1.11.14.2 + Fix warnings that occur when compiling with clang and C++17 mode. #1379 + CI/testing: Additional CI tests for clang+c++17 (#1379), gcc11 (#1381), llvm 12 (#1381), speed up CI builds by not building the testing components of OIIO (#1380). - Update to version 1.11.14.1 + Fix library setup for LLVM installations consisting of static libraries. This fixes a build problem that can crop up on MacOS using Homebrew-installed LLVM 12. #1375 - Update to version 1.11.14.0 + oslc/OSLCompiler: Check for errors when when writing oso (for example, disk volume full). #1360 + Fix crash generating closure function calls with LLVM 11. #1361 + Build: LLVM 12 compatibility. #1351 + Build: Support for CMake 3.20 #1354 + Build: Be robust to certain OpenEXR 2.x config fies. #1356 + Build: Fixes to deal with newer OIIO builds that are C++14. - Remove 0001-LLVM-12-compatibility-fixes.patch fixed upstream - Add build dependency on OpenImageIO (executables) OBS-URL: https://build.opensuse.org/request/show/915143 OBS-URL: https://build.opensuse.org/package/show/graphics/OpenShadingLanguage?expand=0&rev=25
This commit is contained in:
Git OBS Bridge
parent
219e07ec9f
commit
56eccc19da
@ -1,82 +0,0 @@
|
||||
From d3ef2dbd517447066710e3bf148b43d8bab3e75d Mon Sep 17 00:00:00 2001
|
||||
From: Euan Haahr <euanhaahrmail2@gmail.com>
|
||||
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 <euanhaahrmail2@gmail.com>
|
||||
---
|
||||
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<unsigned int>(1),
|
||||
+ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
|
||||
+ static_cast<unsigned int>(1),
|
||||
static_cast<unsigned int>(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<unsigned int>(sourceline),
|
||||
+ llvm::DILocation::get(sp->getContext(),
|
||||
+ static_cast<unsigned int>(sourceline),
|
||||
static_cast<unsigned int>(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<unsigned int>(1),
|
||||
+ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
|
||||
+ static_cast<unsigned int>(1),
|
||||
static_cast<unsigned int>(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 <euanhaahrmail2@gmail.com>
|
||||
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 <euanhaahrmail2@gmail.com>
|
||||
---
|
||||
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());
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de192571b1b0cb182f108832a9d2acf5682f46248ed3ecc0464d787ccfc097cf
|
||||
size 14142105
|
||||
3
OpenShadingLanguage-1.11.14.2.tar.gz
Normal file
3
OpenShadingLanguage-1.11.14.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6dea570686740a5d5c81e595020f3fef5b8af7201a95460024c17297fb7eb718
|
||||
size 14143213
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 30 15:24:21 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
- Update to version 1.11.14.2
|
||||
+ Fix warnings that occur when compiling with clang and C++17 mode. #1379
|
||||
+ CI/testing: Additional CI tests for clang+c++17 (#1379), gcc11 (#1381),
|
||||
llvm 12 (#1381), speed up CI builds by not building the testing components
|
||||
of OIIO (#1380).
|
||||
|
||||
- Update to version 1.11.14.1
|
||||
+ Fix library setup for LLVM installations consisting of static libraries.
|
||||
This fixes a build problem that can crop up on MacOS using
|
||||
Homebrew-installed LLVM 12. #1375
|
||||
|
||||
- Update to version 1.11.14.0
|
||||
+ oslc/OSLCompiler: Check for errors when when writing oso (for example,
|
||||
disk volume full). #1360
|
||||
+ Fix crash generating closure function calls with LLVM 11. #1361
|
||||
+ Build: LLVM 12 compatibility. #1351
|
||||
+ Build: Support for CMake 3.20 #1354
|
||||
+ Build: Be robust to certain OpenEXR 2.x config fies. #1356
|
||||
+ Build: Fixes to deal with newer OIIO builds that are C++14.
|
||||
|
||||
- Remove 0001-LLVM-12-compatibility-fixes.patch
|
||||
fixed upstream
|
||||
- Add build dependency on OpenImageIO (executables)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 2 05:54:38 UTC 2021 - munix9@googlemail.com
|
||||
|
||||
|
||||
@ -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.13.0
|
||||
Version: 1.11.14.2
|
||||
Release: 0
|
||||
Summary: A language for programmable shading
|
||||
License: BSD-3-Clause
|
||||
@ -31,10 +31,8 @@ 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: OpenImageIO
|
||||
BuildRequires: bison
|
||||
BuildRequires: clang-devel >= 7
|
||||
BuildRequires: cmake >= 3.12
|
||||
@ -193,7 +191,7 @@ The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-Release-%{version} -p1
|
||||
%autosetup -p1
|
||||
find . -iname CMakeLists.txt -exec sed "-i" "-e s/COMMAND python/COMMAND python3/" "{}" \;
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user