diff --git a/OpenShadingLanguage-1.11.17.0.tar.gz b/OpenShadingLanguage-1.11.17.0.tar.gz deleted file mode 100644 index d96b2f2..0000000 --- a/OpenShadingLanguage-1.11.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab7e17fde3f759b94efcc159d8f4ccc6cc92f40cba76e4f88a8133a00587738f -size 13888114 diff --git a/OpenShadingLanguage-1.12.6.2.tar.gz b/OpenShadingLanguage-1.12.6.2.tar.gz new file mode 100644 index 0000000..808ba47 --- /dev/null +++ b/OpenShadingLanguage-1.12.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0115a0a09ac9ef0ade88f2434e1472323b335c3f0ddcca0ffd062f9cc822e629 +size 20247666 diff --git a/OpenShadingLanguage.changes b/OpenShadingLanguage.changes index 9c18a43..ce2a5b5 100644 --- a/OpenShadingLanguage.changes +++ b/OpenShadingLanguage.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Oct 19 15:16:37 UTC 2022 - Stefan Brüns + +- update to 1.12.6.2: + For details see + https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.12.6.2 + * Batch shading: A fully operational "batch shading" support when + using CPUs supporting the Intel AVX2 or AVX512 instruction set + architectures, allows shading 8 or 16 points at a time, + accelerated by using SIMD instructions. (Changes contributed + by Intel.) + * OptiX: A reasonable subset of the OSL language can run on + NVIDIA GPUs for Cuda or OptiX-based renderers. + * Standardized material closures: Synchronize with MaterialX on + a minimum standard set of material closures. This is reflected + in both the OSL spec as well as reference implementations of + those closures in testrender. +- Remove subpackage with MaterialX shaders. These were already + deprecated for some time, instead ones from upstream + MaterialX project should be used. +- Drop upstream 0001-Fix-compatibility-with-LLVM-14.patch + ------------------------------------------------------------------- Tue Apr 26 01:04:09 UTC 2022 - Stefan Brüns diff --git a/OpenShadingLanguage.spec b/OpenShadingLanguage.spec index 42f2bd4..cd7fda8 100644 --- a/OpenShadingLanguage.spec +++ b/OpenShadingLanguage.spec @@ -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.17.0 +Version: 1.12.6.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/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: OpenEXR-devel >= 2.3 +BuildRequires: OpenImageIO >= 2.2 BuildRequires: bison BuildRequires: clang-devel > 7 BuildRequires: cmake >= 3.12 @@ -43,7 +41,7 @@ BuildRequires: gcc-c++ BuildRequires: libboost_filesystem-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -BuildRequires: llvm-devel > 7 +BuildRequires: llvm-devel > 9 %ifnarch %{arm} # Build fails with partio on armv7/armv6 BuildRequires: partio-devel @@ -77,20 +75,6 @@ in advanced renderers and other applications, ideal for describing materials, lights, displacement, and pattern generation. This package contains documentation. -%package MaterialX-shaders-source -Summary: MaterialX shader nodes -License: BSD-3-Clause -Group: Development/Languages/Other -Requires: %{name} = %{version} -Requires: %{name}-common-headers - -%description MaterialX-shaders-source -Open Shading Language (OSL) is a language for programmable shading -in advanced renderers and other applications, ideal for describing -materials, lights, displacement, and pattern generation. - -This package contains the code for the MaterialX shader nodes. - %package example-shaders-source Summary: OSL shader examples License: BSD-3-Clause @@ -208,7 +192,6 @@ find . -iname CMakeLists.txt -exec sed "-i" "-e s/COMMAND python/COMMAND python3 -DCMAKE_SKIP_RPATH:BOOL=TRUE \ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \ -DOSL_SHADER_INSTALL_DIR:PATH=%{_datadir}/%{name}/shaders/ \ - -DOSL_BUILD_MATERIALX:BOOL=ON \ -DCMAKE_CXX_STANDARD:STRING=14 %cmake_build @@ -249,9 +232,6 @@ find %{buildroot}%{python3_sitearch} -name oslquery.so -print -delete %license CC-BY-3.0.txt %doc %{_docdir}/%{name}/ -%files MaterialX-shaders-source -%{_datadir}/%{name}/shaders/MaterialX - %files example-shaders-source %{_datadir}/%{name}/shaders/*.osl %{_datadir}/%{name}/shaders/*.oso