Accepting request 1001036 from home:StefanBruens:branches:graphics

- Fix compatibility with LLVM >= 14.0, add
  0001-Fix-compatibility-with-LLVM-14.patch

OBS-URL: https://build.opensuse.org/request/show/1001036
OBS-URL: https://build.opensuse.org/package/show/graphics/OpenShadingLanguage?expand=0&rev=37

0001-Fix-compatibility-with-LLVM-14.patch

@@ -0,0 +1,29 @@
+From 8ceef3f70c787529c0c0e2d214ce0eacc951ec8a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+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
+

OpenShadingLanguage.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 26 01:04:09 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix compatibility with LLVM >= 14.0, add
+  0001-Fix-compatibility-with-LLVM-14.patch
+
 -------------------------------------------------------------------
 Sun Apr 24 17:13:32 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
 

OpenShadingLanguage.spec

@@ -31,23 +31,19 @@ Group:          Productivity/Graphics/Other
 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