Accepting request 1035305 from graphics

OBS-URL: https://build.opensuse.org/request/show/1035305
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/OpenShadingLanguage?expand=0&rev=19

1605.patch

@@ -1,40 +0,0 @@
-From 23ceda5ba82b589ba5f750f8edeb2894b7a6b1e9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Mon, 10 Oct 2022 08:40:18 +0000
-Subject: [PATCH] include the immintrin.h header only when needed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The immintrin.h header is required for the implementation of the
-popcount and coutr_zero function only when the Intel compiler is used.
-Move the inclusion accordingly. The current state breaks build on
-platforms that don't provide the header, but provide the alternative
-means (gcc/clang built-ins, etc).
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- src/include/OSL/mask.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/include/OSL/mask.h b/src/include/OSL/mask.h
-index 24197afb6..b9275f65d 100644
---- a/src/include/OSL/mask.h
-+++ b/src/include/OSL/mask.h
-@@ -4,7 +4,6 @@
- 
- #pragma once
- 
--#include <immintrin.h>
- #include <type_traits>
- 
- #include <OSL/oslconfig.h>
-@@ -23,6 +22,8 @@ using std::countr_zero;
- 
- #elif OSL_INTEL_CLASSIC_COMPILER_VERSION
- 
-+#include <immintrin.h>
-+
- OSL_FORCEINLINE int popcount(uint32_t x) noexcept { return _mm_popcnt_u32(x);}
- OSL_FORCEINLINE int popcount(uint64_t x) noexcept { return _mm_popcnt_u64(x); }
- OSL_FORCEINLINE int countr_zero(uint32_t x) noexcept { return _bit_scan_forward(x); }

OpenShadingLanguage-1.12.6.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0115a0a09ac9ef0ade88f2434e1472323b335c3f0ddcca0ffd062f9cc822e629
-size 20247666

OpenShadingLanguage-1.12.7.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:410d11124f1ff943db8a04e8228383fe180462d17d629cde7349859828236334
+size 20250356

OpenShadingLanguage.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Nov  4 16:54:56 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
+
+- update to 1.12.7.0 -- 1 Nov 2022:
+  * Optix: Change naming of certain compiler-generated constants in
+    a way that improves use of the PTX cache. #1570
+  * Batch: Fix uninitialized members in ReadEvent internals. #1575
+  * testshade --help now prints TextureSystem options and hardware
+    info. #1584
+  * oslc: Fix memory leak in ASTvariable_declaration. #1576
+  * Fix memory leaks in light path expression code. #1593 #1594
+  * Include the immintrin.h header only when needed. #1605
+  * icx: Improvements to fix problems exposed by new icx 2022.2
+    compiler. #1601
+  * Testing: CMake cache variables to control the testing timeout
+    length. #1571
+  * CI: Add a dynamic analysis test using address and leak
+    sanitizers. #1581
+  * CI: Now using SonarCloud static analysis. #1551
+  * CI: Many improvements in testing code coverage #1607
+  * CI: Make sure to run pointcloud tests when partio is found.
+    #1611
+  * Developers: platform.h now defines OSL_ALLOCA macro. #1589
+  * Developers: platform.h now defines OSL::bitcast utility. #1610
+- Remove 1605.patch: included in release
+
 -------------------------------------------------------------------
 Mon Oct 24 11:31:08 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

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.12.6.2
+Version:        1.12.7.0
 Release:        0
 Summary:        A language for programmable shading
 License:        BSD-3-Clause
@@ -31,8 +31,6 @@ 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 - https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1605
-Patch1:         1605.patch
 BuildRequires:  OpenEXR-devel >= 2.3
 BuildRequires:  OpenImageIO >= 2.2
 BuildRequires:  bison