Revert "parallel sorting"

This reverts commit d7d1b42.

Author: deanlee

selfdrive/ui/SConscript

@@ -111,7 +111,7 @@ if arch in ['x86_64', 'Darwin'] and os.path.exists(Dir("#tools/").get_abspath())
   replay_lib_src = ["replay/replay.cc", "replay/logreader.cc", "replay/framereader.cc", "replay/route.cc"]
 
   replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs)
-  replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2', 'curl', 'tbb'] + qt_libs
+  replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2', 'curl'] + qt_libs
   qt_env.Program("replay/replay", ["replay/main.cc"], LIBS=replay_libs)
 
   if GetOption('test'):

selfdrive/ui/replay/logreader.cc

@@ -1,7 +1,6 @@
 #include "selfdrive/ui/replay/logreader.h"
 
 #include <cassert>
-#include <execution>
 #include <bzlib.h>
 #include "selfdrive/common/util.h"
 
@@ -59,6 +58,6 @@ bool LogReader::load(const std::string &file) {
       return false;
     }
   }
-  std::sort(std::execution::par, events.begin(), events.end(), Event::lessThan());
+  std::sort(events.begin(), events.end(), Event::lessThan());
   return true;
 }

selfdrive/ui/replay/replay.cc

@@ -1,6 +1,5 @@
 #include "selfdrive/ui/replay/replay.h"
 
-#include <execution>
 #include <QApplication>
 #include <QDebug>
 
@@ -164,7 +163,7 @@ void Replay::mergeSegments(int cur_seg, int end_idx) {
     for (int n : segments_need_merge) {
       auto &log = segments_[n]->log;
       auto middle = new_events->insert(new_events->end(), log->events.begin(), log->events.end());
-      std::inplace_merge(std::execution::par, new_events->begin(), middle, new_events->end(), Event::lessThan());
+      std::inplace_merge(new_events->begin(), middle, new_events->end(), Event::lessThan());
     }
 
     // update events