Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package OpenSubdiv for openSUSE:Factory
checked in at 2021-11-25 23:05:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenSubdiv (Old)
and /work/SRC/openSUSE:Factory/.OpenSubdiv.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenSubdiv"
Thu Nov 25 23:05:43 2021 rev:5 rq:933734 version:3.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenSubdiv/OpenSubdiv.changes 2020-12-02
13:58:21.297809584 +0100
+++ /work/SRC/openSUSE:Factory/.OpenSubdiv.new.1895/OpenSubdiv.changes
2021-11-25 23:06:05.133207516 +0100
@@ -1,0 +2,33 @@
+Tue Nov 23 18:28:38 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Update to version 3.4.4 (Feb 2021)
+ + Release 3.4.4 is a minor release including bug fixes and
+ configuration improvements
+ + Changes
+ * The "master" branch on GitHub has been renamed "release"
+ (GitHub #1218 #1219)
+ * The CMake configuration has been updated to allow use as a
+ sub-project (GitHub #1206)
+ * Removed obsolete references to hbr from examples/farViewer
+ (GitHub #1217)
+ + Bug Fixes
+ * Fixed bug with sparse PatchTables and irregular face-varying
+ seams (GitHub #1203)
+ * Fixed loss of precision when using double precision stencil
+ tables (GitHub #1207)
+ * Fixed reset of Far::TopologyRefiner::GetMaxLevel() after call
+ to Unrefine() (GitHub #1208)
+ * Fixed linking with -ldl on unix systems (GitHub #1196)
+ * Fixed naming and installation of macOS frameworks (GitHub
+ #1194 #1201)
+ * Fixed GL version and extension processing and dynamic loading
+ on macOS (GitHub #1216)
+ * Fixed FindDocutils.cmake to be more robust (GitHub #1213
+ #1220)
+ * Fixed errors using build_scripts/build_osd.py with Python3
+ (GitHub #1206)
+- Add OpenSubdiv-pr1234-tbb2021.patch -- support oneTBB 2021
+ * gh#PixarAnimationStudios/OpenSubdiv#1234
+ * boo#1192994
+
+-------------------------------------------------------------------
Old:
----
OpenSubdiv-3_4_3.tar.gz
New:
----
OpenSubdiv-3_4_4.tar.gz
OpenSubdiv-pr1234-tbb2021.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenSubdiv.spec ++++++
--- /var/tmp/diff_new_pack.JbHcNH/_old 2021-11-25 23:06:06.381203211 +0100
+++ /var/tmp/diff_new_pack.JbHcNH/_new 2021-11-25 23:06:06.385203197 +0100
@@ -1,7 +1,7 @@
#
# spec file for package OpenSubdiv
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2019-2020 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -17,18 +17,20 @@
#
-%define pkgver 3_4_3
+%define pkgver 3_4_4
%define libname libosdCPU%{pkgver}
Name: OpenSubdiv
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Subdivision surface evaluation library
License: Apache-2.0
Group: Productivity/Graphics/Visualization/Raytracers
URL: https://graphics.pixar.com/opensubdiv/docs/intro.html
Source:
https://github.com/PixarAnimationStudios/%{name}/archive/v%{pkgver}.tar.gz#/%{name}-%{pkgver}.tar.gz
-Patch: remove-rpath-fiddling.diff
+Patch0: remove-rpath-fiddling.diff
+# PATCH-FIX-UPSTREAM OpenSubdiv-pr1234-tbb2021.patch -- support oneTBB 2021
gh#PixarAnimationStudios/OpenSubdiv#1234
+Patch1:
https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1234.patch#/OpenSubdiv-pr1234-tbb2021.patch
BuildRequires: cmake >= 2.8.6
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -73,7 +75,8 @@
%prep
%setup -q -n %{name}-%{pkgver}
-%autopatch -p0
+%patch0 -p0
+%patch1 -p1
# work around linking glitch
sed -i 's/${PLATFORM_GPU_LIBRARIES}/${PLATFORM_GPU_LIBRARIES}
${CMAKE_DL_LIBS}/' opensubdiv/CMakeLists.txt
@@ -99,7 +102,7 @@
-DGLFW_LOCATION=/usr \
-DOpenGL_GL_PREFERENCE=GLVND
-make %{?_smp_mflags}
+%cmake_build
%install
%cmake_install
++++++ OpenSubdiv-3_4_3.tar.gz -> OpenSubdiv-3_4_4.tar.gz ++++++
/work/SRC/openSUSE:Factory/OpenSubdiv/OpenSubdiv-3_4_3.tar.gz
/work/SRC/openSUSE:Factory/.OpenSubdiv.new.1895/OpenSubdiv-3_4_4.tar.gz differ:
char 13, line 1
++++++ OpenSubdiv-pr1234-tbb2021.patch ++++++
>From 7375c99a4d1337f9b79775fb2c753e7865968642 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftw...@logarithmus.dev>
Date: Sun, 25 Jul 2021 20:34:48 +0300
Subject: [PATCH 1/2] Fix typo: schedular -> scheduler
---
opensubdiv/osd/tbbEvaluator.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/opensubdiv/osd/tbbEvaluator.h b/opensubdiv/osd/tbbEvaluator.h
index 6bd365bc5..886a94837 100644
--- a/opensubdiv/osd/tbbEvaluator.h
+++ b/opensubdiv/osd/tbbEvaluator.h
@@ -1226,7 +1226,7 @@ class TbbEvaluator {
/// \brief synchronize all asynchronous computation invoked on this device.
static void Synchronize(void *deviceContext = NULL);
- /// \brief initialize tbb task schedular
+ /// \brief initialize tbb task scheduler
/// (optional: client may use tbb::task_scheduler_init)
///
/// @param numThreads how many threads
>From 9079a517f406afba9ea50657b0a0786ad7a7bdcb Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftw...@logarithmus.dev>
Date: Sun, 25 Jul 2021 20:58:27 +0300
Subject: [PATCH 2/2] Support oneTBB 2021
---
opensubdiv/osd/tbbEvaluator.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
index c98db9f6d..66c2ed58f 100644
--- a/opensubdiv/osd/tbbEvaluator.cpp
+++ b/opensubdiv/osd/tbbEvaluator.cpp
@@ -25,7 +25,8 @@
#include "../osd/tbbEvaluator.h"
#include "../osd/tbbKernel.h"
-#include <tbb/task_scheduler_init.h>
+#define TBB_PREVIEW_GLOBAL_CONTROL true
+#include <tbb/global_control.h>
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
/* static */
void
TbbEvaluator::SetNumThreads(int numThreads) {
- if (numThreads == -1) {
- tbb::task_scheduler_init init;
- } else {
- tbb::task_scheduler_init init(numThreads);
+ if (numThreads != -1) {
+ tbb::global_control tbb_global_control(
+ tbb::global_control::max_allowed_parallelism,
+ numThreads
+ );
}
}
