From 3fc08e42325a20fe8cc0873b9e628f8cde4a080a Mon Sep 17 00:00:00 2001
From: Comma User <user@comma.ai>
Date: Fri, 28 Feb 2020 19:58:05 -0800
Subject: [PATCH] fix sim

old-commit-hash: 1457001c2d74f89cd19ca380b4e7515a311f82b0
---
 tools/sim/start_carla.sh |  2 +-
 tools/ubuntu_setup.sh    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/sim/start_carla.sh b/tools/sim/start_carla.sh
index aaad223fe7..d3e4dddd32 100755
--- a/tools/sim/start_carla.sh
+++ b/tools/sim/start_carla.sh
@@ -9,7 +9,7 @@ if [ ! -d carla ]; then
   mkdir -p carla_tmp
   cd carla_tmp
   tar xvf ../$FILE
-  easy_install PythonAPI/carla/dist/carla-0.9.7-py3.5-linux-x86_64.egg
+  easy_install PythonAPI/carla/dist/carla-0.9.7-py3.5-linux-x86_64.egg || true
   cd ../
   mv carla_tmp carla
 fi
diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh
index e037e421f9..77eab984d1 100755
--- a/tools/ubuntu_setup.sh
+++ b/tools/ubuntu_setup.sh
@@ -21,6 +21,7 @@ sudo apt-get update && sudo apt-get install -y \
     libmysqlclient-dev \
     libomp-dev \
     libopencv-dev \
+    libpng16-16 \
     libssl-dev \
     libstdc++-arm-none-eabi-newlib \
     libsqlite3-dev \
@@ -52,10 +53,17 @@ pip install pipenv==2018.11.26
 cd ../
 pipenv install --system --deploy
 
-# TODO: add openpilot to PYTHONPATH and external to PATH
+# TODO: add openpilot to PYTHONPATH and external to PATH, this should be in bashrc
 # export PYTHONPATH="$HOME/openpilot"
 # export PATH="$PATH:$HOME/openpilot/external/capnp/bin"
 # export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/openpilot/external/capnp/lib"
 
 # TODO: run external/capnp/build.sh ... needed?
 
+# at this point, manager runs
+
+# to make tools work
+sudo apt install ffmpeg libavformat-dev libavcodec-dev libavdevice-dev libavutil-dev libswscale-dev libavresample-dev libavfilter-dev
+
+pip install -r tools/requirements.txt
+