From 227fa68696a25adbd010b7c759e30191fa36d0c9 Mon Sep 17 00:00:00 2001
From: Ray molenkamp <LazyDodo>
Date: Tue, 9 Feb 2021 14:14:00 +0000
Subject: CMake/Deps: TBB 2020U2

Straight forward version bump.

2020U2 is significantly louder in the deprecated header usage warning
department, we should probably see if we need to act on this: P1949

Differential Revision: https://developer.blender.org/D10359
---
 build_files/build_environment/cmake/tbb.cmake            |  3 ++-
 build_files/build_environment/cmake/versions.cmake       |  4 ++--
 build_files/build_environment/patches/cmakelists_tbb.txt |  1 +
 build_files/build_environment/patches/tbb.diff           | 13 +++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 build_files/build_environment/patches/tbb.diff

(limited to 'build_files/build_environment')

diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake
index 82cd9291ddf..99614f18d83 100644
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -42,7 +42,8 @@ ExternalProject_Add(external_tbb
   URL_HASH MD5=${TBB_HASH}
   PREFIX ${BUILD_DIR}/tbb
   PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
+  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver &&
+  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/tbb/src/external_tbb < ${PATCH_DIR}/tbb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tbb
 )
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 6d8c13fb88d..b335f4accc7 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -144,9 +144,9 @@ set(PYTHON_SHORT_VERSION_NO_DOTS 39)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
 set(PYTHON_HASH 61981498e75ac8f00adcb908281fadb6)
 
-set(TBB_VERSION 2019_U9)
+set(TBB_VERSION 2020_U2)
 set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 26263622e9187212ec240dcf01b66207)
+set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
 
 set(OPENVDB_VERSION 7.0.0)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
diff --git a/build_files/build_environment/patches/cmakelists_tbb.txt b/build_files/build_environment/patches/cmakelists_tbb.txt
index 7edf3aa2785..4032e5d6f83 100644
--- a/build_files/build_environment/patches/cmakelists_tbb.txt
+++ b/build_files/build_environment/patches/cmakelists_tbb.txt
@@ -20,6 +20,7 @@ if(APPLE)
 endif()
 
 file(GLOB tbb_src "${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/old/*.cpp")
+list(REMOVE_ITEM tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/tbb_bind.cpp)
 list(APPEND tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/rml/client/rml_tbb.cpp)
 file(GLOB to_remove "${CMAKE_CURRENT_SOURCE_DIR}/src/old/test*.cpp")
 list(REMOVE_ITEM tbb_src ${to_remove})
diff --git a/build_files/build_environment/patches/tbb.diff b/build_files/build_environment/patches/tbb.diff
new file mode 100644
index 00000000000..c05c35bca95
--- /dev/null
+++ b/build_files/build_environment/patches/tbb.diff
@@ -0,0 +1,13 @@
+diff --git a/include/tbb/tbb_config.h b/include/tbb/tbb_config.h
+index 7a8d06a0..886699d8 100644
+--- a/include/tbb/tbb_config.h
++++ b/include/tbb/tbb_config.h
+@@ -620,7 +620,7 @@ There are four cases that are supported:
+ // instantiation site, which is too late for suppression of the corresponding messages for internal
+ // stuff.
+ #if !defined(__INTEL_COMPILER) && (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0))
+-    #if (__cplusplus >= 201402L)
++    #if (__cplusplus >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
+         #define __TBB_DEPRECATED [[deprecated]]
+         #define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
+     #elif _MSC_VER
\ No newline at end of file
-- 
cgit v1.2.3