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-10-25 13:59:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenShadingLanguage (Old)
and /work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenShadingLanguage"
Tue Oct 25 13:59:16 2022 rev:18 rq:1031108 version:1.12.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenShadingLanguage/OpenShadingLanguage.changes
2022-10-21 16:19:13.638136886 +0200
+++
/work/SRC/openSUSE:Factory/.OpenShadingLanguage.new.2275/OpenShadingLanguage.changes
2022-10-25 13:59:17.524401292 +0200
@@ -1,0 +2,6 @@
+Mon Oct 24 11:31:08 UTC 2022 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Add upstream patch to fix build on Arm:
+ * 1605.patch
+
+-------------------------------------------------------------------
New:
----
1605.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenShadingLanguage.spec ++++++
--- /var/tmp/diff_new_pack.BxUv2L/_old 2022-10-25 13:59:18.216402396 +0200
+++ /var/tmp/diff_new_pack.BxUv2L/_new 2022-10-25 13:59:18.224402408 +0200
@@ -31,6 +31,8 @@
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
++++++ 1605.patch ++++++
>From 23ceda5ba82b589ba5f750f8edeb2894b7a6b1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <d...@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 <d...@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); }
