Fix tbb build

https://github.com/CloudCompare/CloudCompare/issues/1385

1 files changed, 13 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 544ba15b7f9e..2b11ee97c7b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ name=cloudcompare
 options=('!strip') # strip would also remove plugins, for some reason
 pkgname=${name}-git
 pkgver=2.12.1.r33.g554904fb
-pkgrel=1
+pkgrel=2
 pkgdesc="A 3D point cloud (and triangular mesh) processing software"
 arch=('i686' 'x86_64')
 url="http://www.danielgm.net/cc/"
@@ -24,11 +24,15 @@ source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git${_fragmen
         "${name}-cork::git+https://github.com/CloudCompare/cork.git"
         CloudCompare.desktop
         ccViewer.desktop
+        tbb.2021.patch
+        tbb.2021.cccorelib.patch
         )
 sha256sums=('SKIP'
             'SKIP'
             '14096df9cf7aca3099d5df1585d1cf669544e9b10754dce3d2507100dd7034fe'
             '821ac2540e1196774e26f8033946ce7b36223dae7a2a7c78f4a901b4177f68cc'
+            'f10ac084b1ec626c7a9c51e09faf87054edd0c069f4114334d9b1ed664a16ff1'
+            'c4549314b559f61878f63ea9d98aa6da0df3cb7bf8dff709ba089494ab58a32f'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -38,16 +42,17 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP')
 
-prepare() {
-  prepare_submodule
-  #fix gcc:11 porting
-  sed '1 i\#include <limits>' -i "${srcdir}/${name}"/plugins/core/IO/qE57IO/extern/libE57Format/src/E57XmlParser.cpp
-}
-
 pkgver() {
   git -C "${srcdir}/${name}" describe --long --tag | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
+prepare() {
+  prepare_submodule
+# sed "/CXX_STANDARD/s/14/17/" -i "${srcdir}/${name}"/cmake/CMakeSetCompilerOptions.cmake
+  git -C "${srcdir}/${name}" apply -v "${srcdir}"/tbb.2021.patch
+  git -C "${srcdir}/${name}/libs/qCC_db/extern/CCCoreLib" apply -v "${srcdir}"/tbb.2021.cccorelib.patch
+}
+
 build() {
   export CCACHE_BASEDIR="$srcdir"
 # shellcheck disable=SC2191
@@ -60,7 +65,7 @@ build() {
         -DCMAKE_INSTALL_LIBDIR=lib
         -DCMAKE_BUILD_TYPE=Release
         -DCCCORELIB_USE_CGAL=ON
-        -DCCCORELIB_USE_TBB=OFF
+        -DCCCORELIB_USE_TBB=ON
         -DPOISSON_RECON_WITH_OPEN_MP:BOOL=ON
         -DPLUGIN_EXAMPLE_GL:BOOL=OFF # no need to bundle examples
         -DPLUGIN_EXAMPLE_IO:BOOL=OFF