diff --git a/0001-LLVM-12-compatibility-fixes.patch b/0001-LLVM-12-compatibility-fixes.patch deleted file mode 100644 index f711f34..0000000 --- a/0001-LLVM-12-compatibility-fixes.patch +++ /dev/null @@ -1,82 +0,0 @@ -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.13.0.tar.gz b/OpenShadingLanguage-1.11.13.0.tar.gz deleted file mode 100644 index 9156b0c..0000000 --- a/OpenShadingLanguage-1.11.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de192571b1b0cb182f108832a9d2acf5682f46248ed3ecc0464d787ccfc097cf -size 14142105 diff --git a/OpenShadingLanguage-1.11.14.2.tar.gz b/OpenShadingLanguage-1.11.14.2.tar.gz new file mode 100644 index 0000000..78bf386 --- /dev/null +++ b/OpenShadingLanguage-1.11.14.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dea570686740a5d5c81e595020f3fef5b8af7201a95460024c17297fb7eb718 +size 14143213 diff --git a/OpenShadingLanguage.changes b/OpenShadingLanguage.changes index c808220..a685de6 100644 --- a/OpenShadingLanguage.changes +++ b/OpenShadingLanguage.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Aug 31 14:36:55 UTC 2021 - Hans-Peter Jansen + +- Fix source URL + +------------------------------------------------------------------- +Mon Aug 30 15:24:21 UTC 2021 - Hans-Peter Jansen + +- 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 diff --git a/OpenShadingLanguage.spec b/OpenShadingLanguage.spec index dded37f..92a3d03 100644 --- a/OpenShadingLanguage.spec +++ b/OpenShadingLanguage.spec @@ -23,18 +23,16 @@ %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 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 +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 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