bump(x11/opensubdiv): 3.6.0
This commit is contained in:
parent
82b795bcaf
commit
5b96d5b674
|
@ -4,9 +4,11 @@ TERMUX_PKG_DESCRIPTION="A set of open source libraries that implement high perfo
|
|||
TERMUX_PKG_LICENSE="custom"
|
||||
TERMUX_PKG_LICENSE_FILE="LICENSE.txt, NOTICE.txt"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=3.5.0
|
||||
TERMUX_PKG_VERSION="3.6.0"
|
||||
TERMUX_PKG_SRCURL=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v${TERMUX_PKG_VERSION//./_}.tar.gz
|
||||
TERMUX_PKG_SHA256=8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095
|
||||
TERMUX_PKG_SHA256=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+_\d+_\d+"
|
||||
TERMUX_PKG_DEPENDS="libc++, libtbb, opengl"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
-DNO_EXAMPLES=ON
|
||||
|
@ -18,3 +20,13 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|||
-DNO_TESTS=ON
|
||||
-DNO_GLFW=ON
|
||||
"
|
||||
|
||||
termux_pkg_auto_update() {
|
||||
# Get latest release tag:
|
||||
local tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}" newest-tag)"
|
||||
if grep -qP "^${TERMUX_PKG_UPDATE_VERSION_REGEXP}\$" <<<"$tag"; then
|
||||
termux_pkg_upgrade_version "$tag"
|
||||
else
|
||||
echo "WARNING: Skipping auto-update: Not a release ($tag)"
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -1,28 +1,5 @@
|
|||
https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1234
|
||||
|
||||
From 7375c99a4d1337f9b79775fb2c753e7865968642 Mon Sep 17 00:00:00 2001
|
||||
From: Artur Sinila <freesoftware@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 <freesoftware@logarithmus.dev>
|
||||
Date: Sun, 25 Jul 2021 20:58:27 +0300
|
||||
|
@ -36,29 +13,30 @@ 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"
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
#include <tbb/parallel_for.h>
|
||||
#if defined(TBB_INTERFACE_VERSION_MAJOR) && (TBB_INTERFACE_VERSION_MAJOR < 12)
|
||||
// This is deprecated functionality.
|
||||
-#include <tbb/task_scheduler_init.h>
|
||||
+#define TBB_PREVIEW_GLOBAL_CONTROL true
|
||||
+#include <tbb/global_control.h>
|
||||
#endif
|
||||
|
||||
namespace OpenSubdiv {
|
||||
namespace OPENSUBDIV_VERSION {
|
||||
@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
|
||||
/* static */
|
||||
void
|
||||
TbbEvaluator::SetNumThreads(int numThreads) {
|
||||
@@ -223,10 +224,12 @@
|
||||
#if defined(TBB_INTERFACE_VERSION_MAJOR) && (TBB_INTERFACE_VERSION_MAJOR < 12)
|
||||
// This is deprecated functionality. We preserve the existing behavior
|
||||
// for consistency (when using older versions of tbb).
|
||||
- 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
|
||||
+ );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue