Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package OpenShadingLanguage for
openSUSE:Factory checked in at 2022-09-04 22:11:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenShadingLanguage (Old)
and /work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenShadingLanguage"
Sun Sep 4 22:11:54 2022 rev:16 rq:1001124 version:1.11.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenShadingLanguage/OpenShadingLanguage.changes
2022-04-24 20:34:27.297054277 +0200
+++
/work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.2083/OpenShadingLanguage.changes
2022-09-04 22:12:03.408332035 +0200
@@ -1,0 +2,6 @@
+Tue Apr 26 01:04:09 UTC 2022 - Stefan Br??ns <[email protected]>
+
+- Fix compatibility with LLVM >= 14.0, add
+ 0001-Fix-compatibility-with-LLVM-14.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-compatibility-with-LLVM-14.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenShadingLanguage.spec ++++++
--- /var/tmp/diff_new_pack.ippQYT/_old 2022-09-04 22:12:03.912333454 +0200
+++ /var/tmp/diff_new_pack.ippQYT/_new 2022-09-04 22:12:03.916333464 +0200
@@ -31,23 +31,19 @@
URL:
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
Source0:
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v%{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 - Extracted from
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1492
+Patch0: 0001-Fix-compatibility-with-LLVM-14.patch
BuildRequires: OpenEXR-devel
BuildRequires: OpenImageIO
BuildRequires: bison
-%if 0%{suse_version} > 1500
-# llvm 13 removed some interfaces
-BuildRequires: clang12-devel
-BuildRequires: llvm12-devel
-%else
BuildRequires: clang-devel > 7
-BuildRequires: llvm-devel > 7
-%endif
BuildRequires: cmake >= 3.12
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
+BuildRequires: llvm-devel > 7
%ifnarch %{arm}
# Build fails with partio on armv7/armv6
BuildRequires: partio-devel
++++++ 0001-Fix-compatibility-with-LLVM-14.patch ++++++
>From 8ceef3f70c787529c0c0e2d214ce0eacc951ec8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Tue, 26 Apr 2022 02:59:50 +0200
Subject: [PATCH] Fix compatibility with LLVM >= 14
Fixes #1496.
---
src/liboslexec/llvm_util.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
index 45e0b3e..96651f0 100644
--- a/src/liboslexec/llvm_util.cpp
+++ b/src/liboslexec/llvm_util.cpp
@@ -37,7 +37,11 @@
#include <llvm/Support/raw_os_ostream.h>
#include <llvm/IR/LegacyPassManager.h>
#include <llvm/IR/ValueSymbolTable.h>
+#if OSL_LLVM_VERSION < 140
#include <llvm/Support/TargetRegistry.h>
+#else
+#include <llvm/MC/TargetRegistry.h>
+#endif
#include <llvm/Bitcode/BitcodeReader.h>
#include <llvm/Bitcode/BitcodeWriter.h>
--
2.35.3
