ports/graphics/blender/files/patch-intern_cycles_util_util__task.cpp
Ganael LAPLANCHE 34fdd4dc58 Introduce devel/onetbb and mark devel/tbb as legacy
Intel oneAPI tbb 2021.1 (onetbb) has been released[1][2] and has deprecated
several interfaces over tbb 2020, breaking most dependent ports.

Old tbb 2020 will be kept for a certain time to allow transition but will be
removed in a near future as it CONFLICTS with devel/onetbb. New ports should
now use devel/onetbb instead of devel/tbb.

We tried to move a maximum number of dependent ports to devel/onetbb (or
disable dependency when not possible), but some of them still remain stuck
to devel/tbb. Remaining ones have not been identified as major dependencies
themselves and will be fixed as soon as updates are available from upstream.

PR:		252648, 252688 [3], 252683 [4], 252651 [5], 252690 [3], 252693 [3],
	252695 [3], 252696 [3], 252786 [3], 252649, 252868 [6], 252870 [5],
	252684 [7], 252785 [7]
Approved by:	yuri [3], jwb [4], thierry [5], FreeBSD@Shaneware.biz [6],
	maintainer timeout [7]

[1] https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html
[2] https://software.intel.com/content/www/us/en/develop/articles/tbb-revamp.html
2021-02-19 15:14:46 +00:00

11 lines
288 B
C++

--- intern/cycles/util/util_task.cpp.orig 2021-01-21 08:00:29 UTC
+++ intern/cycles/util/util_task.cpp
@@ -62,7 +62,7 @@ void TaskPool::cancel()
bool TaskPool::canceled()
{
- return tbb_group.is_canceling();
+ return tbb::is_current_task_group_canceling();
}
/* Task Scheduler */