Simple update tbb-2022.1.0. Tested with upcoming blender on amd64. OK?
Cheers Rafael
diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index b714aa642f6..253f4777a0c 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -1,15 +1,15 @@
COMMENT = threading building blocks
-V = 2021.13.0
+V = 2022.1.0
GH_ACCOUNT = oneapi-src
GH_PROJECT = oneTBB
GH_TAGNAME = v${V}
+
PKGNAME = tbb-${V}
-REVISION = 1
-SHARED_LIBS += tbb 2.0 # 2021.13
-SHARED_LIBS += tbbmalloc 2.0 # 2021.13
-SHARED_LIBS += tbbmalloc_proxy 0.0 # 2021.13
+SHARED_LIBS += tbb 2.1 # 2022.1
+SHARED_LIBS += tbbmalloc 3.0 # 2022.1
+SHARED_LIBS += tbbmalloc_proxy 0.0 # 2022.1
CATEGORIES = devel
diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo
index 07e596f1502..9b10932deff 100644
--- a/devel/tbb/distinfo
+++ b/devel/tbb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oneTBB-2021.13.0.tar.gz) = OtXdCJVLOdET3Fs/io3G3B/VJQAyt8SR6weu1clBM+E=
-SIZE (oneTBB-2021.13.0.tar.gz) = 2613916
+SHA256 (oneTBB-2022.1.0.tar.gz) = 7QZ2A+zg3IMtKIG6XFFmJawlIsZl2V92fvYwTjT5YbU=
+SIZE (oneTBB-2022.1.0.tar.gz) = 3434602
diff --git a/devel/tbb/patches/patch-cmake_compilers_Clang_cmake
b/devel/tbb/patches/patch-cmake_compilers_Clang_cmake
index 16ec212f221..2b9d4736876 100644
--- a/devel/tbb/patches/patch-cmake_compilers_Clang_cmake
+++ b/devel/tbb/patches/patch-cmake_compilers_Clang_cmake
@@ -1,7 +1,7 @@
Index: cmake/compilers/Clang.cmake
--- cmake/compilers/Clang.cmake.orig
+++ cmake/compilers/Clang.cmake
-@@ -35,7 +35,7 @@ elseif (MSVC)
+@@ -39,7 +39,7 @@ elseif (MSVC)
return()
else()
set(TBB_LINK_DEF_FILE_FLAG -Wl,--version-script=)
diff --git a/devel/tbb/patches/patch-cmake_compilers_GNU_cmake
b/devel/tbb/patches/patch-cmake_compilers_GNU_cmake
index e927115fd7c..4436b039832 100644
--- a/devel/tbb/patches/patch-cmake_compilers_GNU_cmake
+++ b/devel/tbb/patches/patch-cmake_compilers_GNU_cmake
@@ -3,7 +3,7 @@ fix build on sparc64
Index: cmake/compilers/GNU.cmake
--- cmake/compilers/GNU.cmake.orig
+++ cmake/compilers/GNU.cmake
-@@ -81,4 +81,3 @@ endif ()
+@@ -119,4 +119,3 @@ endif ()
# TBB malloc settings
set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
diff --git a/devel/tbb/patches/patch-src_tbb_CMakeLists_txt
b/devel/tbb/patches/patch-src_tbb_CMakeLists_txt
index d39bae8b5b5..4eb9fd6054f 100644
--- a/devel/tbb/patches/patch-src_tbb_CMakeLists_txt
+++ b/devel/tbb/patches/patch-src_tbb_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: src/tbb/CMakeLists.txt
--- src/tbb/CMakeLists.txt.orig
+++ src/tbb/CMakeLists.txt
-@@ -168,7 +168,7 @@ if (TBB_INSTALL)
+@@ -193,7 +193,7 @@ if (TBB_INSTALL)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(TBB_PC_NAME tbb)
else()
diff --git a/devel/tbb/patches/patch-src_tbb_semaphore_h
b/devel/tbb/patches/patch-src_tbb_semaphore_h
deleted file mode 100644
index dbf67e5a657..00000000000
--- a/devel/tbb/patches/patch-src_tbb_semaphore_h
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix futex support on OpenBSD (#1499)
-42b833fe806606d05a5cad064b8b87365818d716
-
-Index: src/tbb/semaphore.h
---- src/tbb/semaphore.h.orig
-+++ src/tbb/semaphore.h
-@@ -98,7 +98,11 @@ namespace r1 {
- #if __TBB_USE_FUTEX
-
- static inline int futex_wait( void *futex, int comparand ) {
-+#ifdef __OpenBSD__
-+ int r = ::futex((volatile uint32_t *)futex, __TBB_FUTEX_WAIT, comparand,
nullptr, nullptr);
-+#else
- int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAIT, comparand, nullptr,
nullptr, 0);
-+#endif
- #if TBB_USE_ASSERT
- int e = errno;
- __TBB_ASSERT(r == 0 || r == EWOULDBLOCK || (r == -1 && (e == EAGAIN || e
== EINTR)), "futex_wait failed.");
-@@ -107,7 +111,11 @@ static inline int futex_wait( void *futex, int compara
- }
-
- static inline int futex_wakeup_one( void *futex ) {
-+#ifdef __OpenBSD__
-+ int r = ::futex((volatile uint32_t *)futex, __TBB_FUTEX_WAKE, 1 ,
nullptr, nullptr);
-+#else
- int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAKE, 1, nullptr,
nullptr, 0);
-+#endif
- __TBB_ASSERT(r == 0 || r == 1, "futex_wakeup_one: more than one thread
woken up?");
- return r;
- }
diff --git a/devel/tbb/patches/patch-test_common_utils_dynamic_libs_h
b/devel/tbb/patches/patch-test_common_utils_dynamic_libs_h
deleted file mode 100644
index 3b10704dca0..00000000000
--- a/devel/tbb/patches/patch-test_common_utils_dynamic_libs_h
+++ /dev/null
@@ -1,15 +0,0 @@
-Set the extension correctly for OpenBSD (#1468)
-e85d3705e72b02587fd20e2d7eaf85f865968202
-
-Index: test/common/utils_dynamic_libs.h
---- test/common/utils_dynamic_libs.h.orig
-+++ test/common/utils_dynamic_libs.h
-@@ -58,7 +58,7 @@ namespace utils {
- #define EXT ".dylib"
- #endif
- // Android SDK build system does not support .so file name versioning
--#elif __FreeBSD__ || __NetBSD__ || __sun || _AIX || __ANDROID__
-+#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
- #define EXT ".so"
- #elif __unix__ // Order of these elif's matters!
- #define EXT __TBB_STRING(.so.2)
diff --git a/devel/tbb/pkg/PLIST b/devel/tbb/pkg/PLIST
index 420bcba744c..bc18cf9e115 100644
--- a/devel/tbb/pkg/PLIST
+++ b/devel/tbb/pkg/PLIST
@@ -1,6 +1,7 @@
include/oneapi/
include/oneapi/tbb/
include/oneapi/tbb.h
+include/oneapi/tbb/blocked_nd_range.h
include/oneapi/tbb/blocked_range.h
include/oneapi/tbb/blocked_range2d.h
include/oneapi/tbb/blocked_range3d.h
@@ -95,6 +96,7 @@ include/oneapi/tbb/tbbmalloc_proxy.h
include/oneapi/tbb/tick_count.h
include/oneapi/tbb/version.h
include/tbb/
+include/tbb/blocked_nd_range.h
include/tbb/blocked_range.h
include/tbb/blocked_range2d.h
include/tbb/blocked_range3d.h
