From b252f64c33a8cf9653784db3bef65a1e13aff59c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Thu, 27 Apr 2023 16:32:25 -0400
Subject: [PATCH 1/3] re-enable testSmartStereoProjectionFactorPP

---
 gtsam_unstable/slam/tests/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gtsam_unstable/slam/tests/CMakeLists.txt b/gtsam_unstable/slam/tests/CMakeLists.txt
index 6872dd575..bb5259ef2 100644
--- a/gtsam_unstable/slam/tests/CMakeLists.txt
+++ b/gtsam_unstable/slam/tests/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Exclude tests that don't work
 set (slam_excluded_tests
     testSerialization.cpp
-    testSmartStereoProjectionFactorPP.cpp # unstable after PR #1442
 )
 
 gtsamAddTestsGlob(slam_unstable "test*.cpp" "${slam_excluded_tests}" "gtsam_unstable")

From c8c10d3f5d3407b56cc7e5b9d82c46cab0a0a1fb Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Sun, 30 Apr 2023 15:43:09 -0400
Subject: [PATCH 2/3] install newer version of TBB

---
 .github/scripts/unix.sh | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/.github/scripts/unix.sh b/.github/scripts/unix.sh
index af9ac8991..557255474 100644
--- a/.github/scripts/unix.sh
+++ b/.github/scripts/unix.sh
@@ -8,33 +8,14 @@
 # install TBB with _debug.so files
 function install_tbb()
 {
-  TBB_BASEURL=https://github.com/oneapi-src/oneTBB/releases/download
-  TBB_VERSION=4.4.5
-  TBB_DIR=tbb44_20160526oss
-  TBB_SAVEPATH="/tmp/tbb.tgz"
-
   if [ "$(uname)" == "Linux" ]; then
-    OS_SHORT="lin"
-    TBB_LIB_DIR="intel64/gcc4.4"
-    SUDO="sudo"
+    sudo apt-get -y install libtbb-dev
 
   elif [ "$(uname)" == "Darwin" ]; then
-    OS_SHORT="osx"
-    TBB_LIB_DIR=""
-    SUDO=""
+    brew install tbb
 
   fi
 
-  wget "${TBB_BASEURL}/${TBB_VERSION}/${TBB_DIR}_${OS_SHORT}.tgz" -O $TBB_SAVEPATH
-  tar -C /tmp -xf $TBB_SAVEPATH
-
-  TBBROOT=/tmp/$TBB_DIR
-  # Copy the needed files to the correct places.
-  # This works correctly for CI builds, instead of setting path variables.
-  # This is what Homebrew does to install TBB on Macs
-  $SUDO cp -R $TBBROOT/lib/$TBB_LIB_DIR/* /usr/local/lib/
-  $SUDO cp -R $TBBROOT/include/ /usr/local/include/
-
 }
 
 # common tasks before either build or test

From 00c784e5efb0ef829252c49bc2c06ca3bf378d41 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Sun, 30 Apr 2023 18:20:57 -0400
Subject: [PATCH 3/3] install_tbb update in python.sh

---
 .github/scripts/python.sh | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/.github/scripts/python.sh b/.github/scripts/python.sh
index 99fddda68..d026aa123 100644
--- a/.github/scripts/python.sh
+++ b/.github/scripts/python.sh
@@ -9,33 +9,14 @@ set -x -e
 # install TBB with _debug.so files
 function install_tbb()
 {
-  TBB_BASEURL=https://github.com/oneapi-src/oneTBB/releases/download
-  TBB_VERSION=4.4.5
-  TBB_DIR=tbb44_20160526oss
-  TBB_SAVEPATH="/tmp/tbb.tgz"
-
   if [ "$(uname)" == "Linux" ]; then
-    OS_SHORT="lin"
-    TBB_LIB_DIR="intel64/gcc4.4"
-    SUDO="sudo"
+    sudo apt-get -y install libtbb-dev
 
   elif [ "$(uname)" == "Darwin" ]; then
-    OS_SHORT="osx"
-    TBB_LIB_DIR=""
-    SUDO=""
+    brew install tbb
 
   fi
 
-  wget "${TBB_BASEURL}/${TBB_VERSION}/${TBB_DIR}_${OS_SHORT}.tgz" -O $TBB_SAVEPATH
-  tar -C /tmp -xf $TBB_SAVEPATH
-
-  TBBROOT=/tmp/$TBB_DIR
-  # Copy the needed files to the correct places.
-  # This works correctly for CI builds, instead of setting path variables.
-  # This is what Homebrew does to install TBB on Macs
-  $SUDO cp -R $TBBROOT/lib/$TBB_LIB_DIR/* /usr/local/lib/
-  $SUDO cp -R $TBBROOT/include/ /usr/local/include/
-
 }
 
 if [ -z ${PYTHON_VERSION+x} ]; then