Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package OpenShadingLanguage for
openSUSE:Factory checked in at 2021-05-02 18:36:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenShadingLanguage (Old)
and /work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.1947 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenShadingLanguage"
Sun May 2 18:36:14 2021 rev:9 rq:889809 version:1.11.13.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenShadingLanguage/OpenShadingLanguage.changes
2021-04-08 21:32:39.535839615 +0200
+++
/work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.1947/OpenShadingLanguage.changes
2021-05-02 18:39:24.700105214 +0200
@@ -1,0 +2,10 @@
+Sun May 2 05:54:38 UTC 2021 - mun...@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
+
+-------------------------------------------------------------------
Old:
----
OpenShadingLanguage-1.11.12.0.tar.gz
New:
----
0001-LLVM-12-compatibility-fixes.patch
OpenShadingLanguage-1.11.13.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenShadingLanguage.spec ++++++
--- /var/tmp/diff_new_pack.0HZ5O1/_old 2021-05-02 18:39:25.332102521 +0200
+++ /var/tmp/diff_new_pack.0HZ5O1/_new 2021-05-02 18:39:25.336102503 +0200
@@ -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 @@
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 @@
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
++++++ 0001-LLVM-12-compatibility-fixes.patch ++++++
>From d3ef2dbd517447066710e3bf148b43d8bab3e75d Mon Sep 17 00:00:00 2001
From: Euan Haahr <euanhaahrma...@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 <euanhaahrma...@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 <euanhaahrma...@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 <euanhaahrma...@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());
++++++ OpenShadingLanguage-1.11.12.0.tar.gz ->
OpenShadingLanguage-1.11.13.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/OpenShadingLanguage/OpenShadingLanguage-1.11.12.0.tar.gz
/work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.1947/OpenShadingLanguage-1.11.13.0.tar.gz
differ: char 13, line 1
