From f0e47e00a036c04eb892bebb8d91c8b8d632028a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes@intermodalics.eu>
Date: Tue, 11 Dec 2018 09:39:55 +0100
Subject: [PATCH 1/2] opencv: patch 3rdparty/libtiff/CMakeLists.txt to fix
 unknown CMake command error

CMake Error at /opt/ros_android/catkin_ws /src/opencv3/3rdparty/libtiff/CMakeLists.txt:67 (check_type_size):
  Unknown CMake command "check_type_size".
---
 patches/opencv.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/patches/opencv.patch b/patches/opencv.patch
index 5151670..7c8d213 100644
--- a/patches/opencv.patch
+++ b/patches/opencv.patch
@@ -101,4 +101,13 @@
 +            DESTINATION ${OPENCV_OTHER_INSTALL_PATH} COMPONENT libs)
    endif()
  endif()
+--- catkin_ws/src/opencv3/3rdparty/libtiff/CMakeLists.txt
++++ catkin_ws/src/opencv3/3rdparty/libtiff/CMakeLists.txt
+@@ -7,6 +7,7 @@
+ include(CheckCSourceCompiles)
+ include(CheckFunctionExists)
+ include(CheckIncludeFile)
++include(CheckTypeSize)
  
+ 
+ # Find libm, if available 

From bf6c729dbf63a2d827febfc1e8ef4dc84bb8c118 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Ubeira <jubeira@ekumenlabs.com>
Date: Wed, 19 Dec 2018 15:34:33 -0300
Subject: [PATCH 2/2] Deleting incorrect export for CMAKE_PREFIX_PATH.

---
 do_everything.sh | 1 -
 get_ros_stuff.sh | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/do_everything.sh b/do_everything.sh
index b97e19f..a447c44 100755
--- a/do_everything.sh
+++ b/do_everything.sh
@@ -87,7 +87,6 @@ mkdir -p $prefix/libs
 
 # Start with catkin since we use it to build almost everything else
 [ -d $prefix/target ] || mkdir -p $prefix/target
-export CMAKE_PREFIX_PATH=$prefix/target
 
 # Get the android ndk build helper script
 # If file doesn't exist, then download and patch it
diff --git a/get_ros_stuff.sh b/get_ros_stuff.sh
index f499c22..094cd4e 100755
--- a/get_ros_stuff.sh
+++ b/get_ros_stuff.sh
@@ -17,9 +17,6 @@ cmd_exists git || die 'git was not found'
 
 prefix=$(cd $1 && pwd)
 
-[ "$CMAKE_PREFIX_PATH" = "" ] && die 'could not find target basedir. Have you run build_catkin.sh and sourced setup.bash?'
-
-#cd $CMAKE_PREFIX_PATH
 cd $prefix
 mkdir -p catkin_ws/src && cd catkin_ws