Fixed float.h issue. OpenCV with built libraries working for linux x64

261 files changed, 595 insertions, 1056 deletions

diff --git a/thirdparty/includes/OpenCV/opencv/cv.h b/thirdparty/includes/OpenCV/opencv/cv.h
new file mode 100644
index 0000000..77d0971
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cv.h
@@ -0,0 +1,82 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_CV_H__
+#define __OPENCV_OLD_CV_H__
+
+#if defined(_MSC_VER)
+    #define CV_DO_PRAGMA(x) __pragma(x)
+    #define __CVSTR2__(x) #x
+    #define __CVSTR1__(x) __CVSTR2__(x)
+    #define __CVMSVCLOC__ __FILE__ "("__CVSTR1__(__LINE__)") : "
+    #define CV_MSG_PRAGMA(_msg) CV_DO_PRAGMA(message (__CVMSVCLOC__ _msg))
+#elif defined(__GNUC__)
+    #define CV_DO_PRAGMA(x) _Pragma (#x)
+    #define CV_MSG_PRAGMA(_msg) CV_DO_PRAGMA(message (_msg))
+#else
+    #define CV_DO_PRAGMA(x)
+    #define CV_MSG_PRAGMA(_msg)
+#endif
+#define CV_WARNING(x) CV_MSG_PRAGMA("Warning: " #x)
+
+//CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
+
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
+#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/flann/flann.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/legacy/compat.hpp"
+
+#if !defined(CV_IMPL)
+#define CV_IMPL extern "C"
+#endif //CV_IMPL
+
+#if defined(__cplusplus)
+#include "opencv2/core/internal.hpp"
+#endif //__cplusplus
+
+#endif // __OPENCV_OLD_CV_H_
diff --git a/thirdparty/includes/OpenCV/opencv/cv.hpp b/thirdparty/includes/OpenCV/opencv/cv.hpp
new file mode 100644
index 0000000..37b523b
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cv.hpp
@@ -0,0 +1,52 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_CV_HPP__
+#define __OPENCV_OLD_CV_HPP__
+
+//#if defined(__GNUC__)
+//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+//#endif
+
+#include <cv.h>
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cvaux.h b/thirdparty/includes/OpenCV/opencv/cvaux.h
new file mode 100644
index 0000000..b15d068
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cvaux.h
@@ -0,0 +1,65 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_AUX_H__
+#define __OPENCV_OLD_AUX_H__
+
+//#if defined(__GNUC__)
+//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+//#endif
+
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
+#include "opencv2/video/background_segm.hpp"
+#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/legacy/legacy.hpp"
+#include "opencv2/legacy/compat.hpp"
+#include "opencv2/legacy/blobtrack.hpp"
+#include "opencv2/contrib/contrib.hpp"
+
+#endif
+
+/* End of file. */
diff --git a/thirdparty/includes/OpenCV/opencv/cvaux.hpp b/thirdparty/includes/OpenCV/opencv/cvaux.hpp
new file mode 100644
index 0000000..952210b
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cvaux.hpp
@@ -0,0 +1,51 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_AUX_HPP__
+#define __OPENCV_OLD_AUX_HPP__
+
+//#if defined(__GNUC__)
+//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+//#endif
+
+#include <cvaux.h>
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cvwimage.h b/thirdparty/includes/OpenCV/opencv/cvwimage.h
new file mode 100644
index 0000000..de89c92
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cvwimage.h
@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////////
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to
+//  this license.  If you do not agree to this license, do not download,
+//  install, copy or use the software.
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2008, Google, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//  * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//  * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//  * The name of Intel Corporation or contributors may not be used to endorse
+//     or promote products derived from this software without specific
+//     prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is"
+// and any express or implied warranties, including, but not limited to, the
+// implied warranties of merchantability and fitness for a particular purpose
+// are disclaimed. In no event shall the Intel Corporation or contributors be
+// liable for any direct, indirect, incidental, special, exemplary, or
+// consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+
+
+#ifndef __OPENCV_OLD_WIMAGE_HPP__
+#define __OPENCV_OLD_WIMAGE_HPP__
+
+#include "opencv2/core/wimage.hpp"
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cxcore.h b/thirdparty/includes/OpenCV/opencv/cxcore.h
new file mode 100644
index 0000000..d52ad4f
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cxcore.h
@@ -0,0 +1,53 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_CXCORE_H__
+#define __OPENCV_OLD_CXCORE_H__
+
+//#if defined(__GNUC__)
+//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+//#endif
+
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cxcore.hpp b/thirdparty/includes/OpenCV/opencv/cxcore.hpp
new file mode 100644
index 0000000..033b365
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cxcore.hpp
@@ -0,0 +1,52 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_CXCORE_HPP__
+#define __OPENCV_OLD_CXCORE_HPP__
+
+//#if defined(__GNUC__)
+//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+//#endif
+
+#include <cxcore.h>
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cxeigen.hpp b/thirdparty/includes/OpenCV/opencv/cxeigen.hpp
new file mode 100644
index 0000000..1f04d1a
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cxeigen.hpp
@@ -0,0 +1,48 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_EIGEN_HPP__
+#define __OPENCV_OLD_EIGEN_HPP__
+
+#include "opencv2/core/eigen.hpp"
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/cxmisc.h b/thirdparty/includes/OpenCV/opencv/cxmisc.h
new file mode 100644
index 0000000..3a76656
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/cxmisc.h
@@ -0,0 +1,48 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+ * //
+ * //  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+ * //
+ * //  By downloading, copying, installing or using the software you agree to this license.
+ * //  If you do not agree to this license, do not download, install,
+ * //  copy or use the software.
+ * //
+ * //
+ * //                           License Agreement
+ * //                For Open Source Computer Vision Library
+ * //
+ * // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+ * // Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+ * // Third party copyrights are property of their respective owners.
+ * //
+ * // Redistribution and use in source and binary forms, with or without modification,
+ * // are permitted provided that the following conditions are met:
+ * //
+ * //   * Redistribution's of source code must retain the above copyright notice,
+ * //     this list of conditions and the following disclaimer.
+ * //
+ * //   * Redistribution's in binary form must reproduce the above copyright notice,
+ * //     this list of conditions and the following disclaimer in the documentation
+ * //     and/or other materials provided with the distribution.
+ * //
+ * //   * The name of the copyright holders may not be used to endorse or promote products
+ * //     derived from this software without specific prior written permission.
+ * //
+ * // This software is provided by the copyright holders and contributors "as is" and
+ * // any express or implied warranties, including, but not limited to, the implied
+ * // warranties of merchantability and fitness for a particular purpose are disclaimed.
+ * // In no event shall the Intel Corporation or contributors be liable for any direct,
+ * // indirect, incidental, special, exemplary, or consequential damages
+ * // (including, but not limited to, procurement of substitute goods or services;
+ * // loss of use, data, or profits; or business interruption) however caused
+ * // and on any theory of liability, whether in contract, strict liability,
+ * // or tort (including negligence or otherwise) arising in any way out of
+ * // the use of this software, even if advised of the possibility of such damage.
+ * //
+ * //M*/
+
+#ifndef __OPENCV_OLD_CXMISC_H__
+#define __OPENCV_OLD_CXMISC_H__
+
+#include "opencv2/core/internal.hpp"
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/highgui.h b/thirdparty/includes/OpenCV/opencv/highgui.h
new file mode 100644
index 0000000..9725c9f
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/highgui.h
@@ -0,0 +1,50 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_HIGHGUI_H__
+#define __OPENCV_OLD_HIGHGUI_H__
+
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/highgui/highgui.hpp"
+
+#endif
diff --git a/thirdparty/includes/OpenCV/opencv/ml.h b/thirdparty/includes/OpenCV/opencv/ml.h
new file mode 100644
index 0000000..0383a2f
--- /dev/null
+++ b/thirdparty/includes/OpenCV/opencv/ml.h
@@ -0,0 +1,48 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OLD_ML_H__
+#define __OPENCV_OLD_ML_H__
+
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/ml/ml.hpp"
+
+#endif
diff --git a/thirdparty/raspberrypi/includes/opencv2/calib3d.hpp b/thirdparty/includes/OpenCV/opencv2/calib3d.hpp
index 7356c15..7356c15 100644
--- a/thirdparty/raspberrypi/includes/opencv2/calib3d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/calib3d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/calib3d/calib3d.hpp b/thirdparty/includes/OpenCV/opencv2/calib3d/calib3d.hpp
index 5e9cde8..5e9cde8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/calib3d/calib3d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/calib3d/calib3d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/contrib/contrib.hpp b/thirdparty/includes/OpenCV/opencv2/contrib/contrib.hpp
index d587942..d587942 100644
--- a/thirdparty/raspberrypi/includes/opencv2/contrib/contrib.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/contrib/contrib.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/contrib/detection_based_tracker.hpp b/thirdparty/includes/OpenCV/opencv2/contrib/detection_based_tracker.hpp
index 56aa1cc..56aa1cc 100644
--- a/thirdparty/raspberrypi/includes/opencv2/contrib/detection_based_tracker.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/contrib/detection_based_tracker.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/contrib/hybridtracker.hpp b/thirdparty/includes/OpenCV/opencv2/contrib/hybridtracker.hpp
index 3a1f722..3a1f722 100644
--- a/thirdparty/raspberrypi/includes/opencv2/contrib/hybridtracker.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/contrib/hybridtracker.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/contrib/openfabmap.hpp b/thirdparty/includes/OpenCV/opencv2/contrib/openfabmap.hpp
index 6b2834e..6b2834e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/contrib/openfabmap.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/contrib/openfabmap.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/contrib/retina.hpp b/thirdparty/includes/OpenCV/opencv2/contrib/retina.hpp
index f261bb4..f261bb4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/contrib/retina.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/contrib/retina.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core.hpp b/thirdparty/includes/OpenCV/opencv2/core.hpp
index 12773f8..12773f8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/affine.hpp b/thirdparty/includes/OpenCV/opencv2/core/affine.hpp
index 1b560c8..1b560c8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/affine.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/affine.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/core.hpp b/thirdparty/includes/OpenCV/opencv2/core/core.hpp
index 591d50a..591d50a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/core.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/core.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/core_c.h b/thirdparty/includes/OpenCV/opencv2/core/core_c.h
index b9f1090..b9f1090 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/core_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/core/core_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/cuda_devptrs.hpp b/thirdparty/includes/OpenCV/opencv2/core/cuda_devptrs.hpp
index 1534045..1534045 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/cuda_devptrs.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/cuda_devptrs.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/devmem2d.hpp b/thirdparty/includes/OpenCV/opencv2/core/devmem2d.hpp
index 18dfcd8..18dfcd8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/devmem2d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/devmem2d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/eigen.hpp b/thirdparty/includes/OpenCV/opencv2/core/eigen.hpp
index a7b237f..a7b237f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/eigen.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/eigen.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/gpumat.hpp b/thirdparty/includes/OpenCV/opencv2/core/gpumat.hpp
index 68647d9..68647d9 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/gpumat.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/gpumat.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/internal.hpp b/thirdparty/includes/OpenCV/opencv2/core/internal.hpp
index c2c8961..c2c8961 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/internal.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/internal.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/mat.hpp b/thirdparty/includes/OpenCV/opencv2/core/mat.hpp
index 631c698..631c698 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/mat.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/mat.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/opengl_interop.hpp b/thirdparty/includes/OpenCV/opencv2/core/opengl_interop.hpp
index 7ecaa8e..7ecaa8e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/opengl_interop.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/opengl_interop.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/opengl_interop_deprecated.hpp b/thirdparty/includes/OpenCV/opencv2/core/opengl_interop_deprecated.hpp
index 04e3fc0..04e3fc0 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/opengl_interop_deprecated.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/opengl_interop_deprecated.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/operations.hpp b/thirdparty/includes/OpenCV/opencv2/core/operations.hpp
index 0ae51c6..0ae51c6 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/operations.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/operations.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/types_c.h b/thirdparty/includes/OpenCV/opencv2/core/types_c.h
index c21cd2c..c21cd2c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/types_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/core/types_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/version.hpp b/thirdparty/includes/OpenCV/opencv2/core/version.hpp
index 2dbb3c3..2dbb3c3 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/version.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/version.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/core/wimage.hpp b/thirdparty/includes/OpenCV/opencv2/core/wimage.hpp
index c7afa8c..c7afa8c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/core/wimage.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/core/wimage.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/features2d.hpp b/thirdparty/includes/OpenCV/opencv2/features2d.hpp
index 3ab3273..3ab3273 100644
--- a/thirdparty/raspberrypi/includes/opencv2/features2d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/features2d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/features2d/features2d.hpp b/thirdparty/includes/OpenCV/opencv2/features2d/features2d.hpp
index e4e796f..e4e796f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/features2d/features2d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/features2d/features2d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann.hpp b/thirdparty/includes/OpenCV/opencv2/flann.hpp
index ea8fcd7..ea8fcd7 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/flann.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/all_indices.h b/thirdparty/includes/OpenCV/opencv2/flann/all_indices.h
index ff53fd8..ff53fd8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/all_indices.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/all_indices.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/allocator.h b/thirdparty/includes/OpenCV/opencv2/flann/allocator.h
index 26091d0..26091d0 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/allocator.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/allocator.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/any.h b/thirdparty/includes/OpenCV/opencv2/flann/any.h
index 7e3fd79..7e3fd79 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/any.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/any.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/autotuned_index.h b/thirdparty/includes/OpenCV/opencv2/flann/autotuned_index.h
index 454641e..454641e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/autotuned_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/autotuned_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/composite_index.h b/thirdparty/includes/OpenCV/opencv2/flann/composite_index.h
index 02b7bc1..02b7bc1 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/composite_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/composite_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/config.h b/thirdparty/includes/OpenCV/opencv2/flann/config.h
index 56832fd..56832fd 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/config.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/config.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/defines.h b/thirdparty/includes/OpenCV/opencv2/flann/defines.h
index 13833b3..13833b3 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/defines.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/defines.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/dist.h b/thirdparty/includes/OpenCV/opencv2/flann/dist.h
index 5ba3d34..5ba3d34 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/dist.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/dist.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/dummy.h b/thirdparty/includes/OpenCV/opencv2/flann/dummy.h
index 3390981..3390981 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/dummy.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/dummy.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/dynamic_bitset.h b/thirdparty/includes/OpenCV/opencv2/flann/dynamic_bitset.h
index d795b5d..d795b5d 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/dynamic_bitset.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/dynamic_bitset.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/flann.hpp b/thirdparty/includes/OpenCV/opencv2/flann/flann.hpp
index d053488..d053488 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/flann.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/flann/flann.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/flann_base.hpp b/thirdparty/includes/OpenCV/opencv2/flann/flann_base.hpp
index bb5b120..bb5b120 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/flann_base.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/flann/flann_base.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/general.h b/thirdparty/includes/OpenCV/opencv2/flann/general.h
index 87e7e2f..87e7e2f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/general.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/general.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/ground_truth.h b/thirdparty/includes/OpenCV/opencv2/flann/ground_truth.h
index fd8f3ae..fd8f3ae 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/ground_truth.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/ground_truth.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/hdf5.h b/thirdparty/includes/OpenCV/opencv2/flann/hdf5.h
index ef3e999..ef3e999 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/hdf5.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/hdf5.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/heap.h b/thirdparty/includes/OpenCV/opencv2/flann/heap.h
index 92a6ea6..92a6ea6 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/heap.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/heap.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/hierarchical_clustering_index.h b/thirdparty/includes/OpenCV/opencv2/flann/hierarchical_clustering_index.h
index 59423ae..59423ae 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/hierarchical_clustering_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/hierarchical_clustering_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/index_testing.h b/thirdparty/includes/OpenCV/opencv2/flann/index_testing.h
index d764004..d764004 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/index_testing.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/index_testing.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/kdtree_index.h b/thirdparty/includes/OpenCV/opencv2/flann/kdtree_index.h
index 1b8af4a..1b8af4a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/kdtree_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/kdtree_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/kdtree_single_index.h b/thirdparty/includes/OpenCV/opencv2/flann/kdtree_single_index.h
index 252fc4c..252fc4c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/kdtree_single_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/kdtree_single_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/kmeans_index.h b/thirdparty/includes/OpenCV/opencv2/flann/kmeans_index.h
index e119ceb..e119ceb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/kmeans_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/kmeans_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/linear_index.h b/thirdparty/includes/OpenCV/opencv2/flann/linear_index.h
index 0ea084a..0ea084a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/linear_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/linear_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/logger.h b/thirdparty/includes/OpenCV/opencv2/flann/logger.h
index 24f3fb6..24f3fb6 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/logger.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/logger.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/lsh_index.h b/thirdparty/includes/OpenCV/opencv2/flann/lsh_index.h
index 2b89337..2b89337 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/lsh_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/lsh_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/lsh_table.h b/thirdparty/includes/OpenCV/opencv2/flann/lsh_table.h
index cef01b2..cef01b2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/lsh_table.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/lsh_table.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/matrix.h b/thirdparty/includes/OpenCV/opencv2/flann/matrix.h
index 51b6c63..51b6c63 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/matrix.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/matrix.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/miniflann.hpp b/thirdparty/includes/OpenCV/opencv2/flann/miniflann.hpp
index 121f8d0..121f8d0 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/miniflann.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/flann/miniflann.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/nn_index.h b/thirdparty/includes/OpenCV/opencv2/flann/nn_index.h
index 4a874f5..4a874f5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/nn_index.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/nn_index.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/object_factory.h b/thirdparty/includes/OpenCV/opencv2/flann/object_factory.h
index 7f971c5..7f971c5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/object_factory.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/object_factory.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/params.h b/thirdparty/includes/OpenCV/opencv2/flann/params.h
index b40c39e..b40c39e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/params.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/params.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/random.h b/thirdparty/includes/OpenCV/opencv2/flann/random.h
index a3cf5ec..a3cf5ec 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/random.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/random.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/result_set.h b/thirdparty/includes/OpenCV/opencv2/flann/result_set.h
index 9750019..9750019 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/result_set.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/result_set.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/sampling.h b/thirdparty/includes/OpenCV/opencv2/flann/sampling.h
index 396f177..396f177 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/sampling.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/sampling.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/saving.h b/thirdparty/includes/OpenCV/opencv2/flann/saving.h
index 7e3bea5..7e3bea5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/saving.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/saving.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/simplex_downhill.h b/thirdparty/includes/OpenCV/opencv2/flann/simplex_downhill.h
index 145901a..145901a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/simplex_downhill.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/simplex_downhill.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/flann/timer.h b/thirdparty/includes/OpenCV/opencv2/flann/timer.h
index 107371e..107371e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/flann/timer.h
+++ b/thirdparty/includes/OpenCV/opencv2/flann/timer.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/block.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/block.hpp
index 6cc00ae..6cc00ae 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/block.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/block.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/border_interpolate.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/border_interpolate.hpp
index 693ba21..693ba21 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/border_interpolate.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/border_interpolate.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/color.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/color.hpp
index 5af64bf..5af64bf 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/color.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/color.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/common.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/common.hpp
index 26a349f..26a349f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/common.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/common.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/datamov_utils.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/datamov_utils.hpp
index a3f62fb..a3f62fb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/datamov_utils.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/datamov_utils.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/color_detail.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/color_detail.hpp
index c4ec64b..c4ec64b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/color_detail.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/color_detail.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/reduce.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/reduce.hpp
index 091a160..091a160 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/reduce.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/reduce.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/reduce_key_val.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/reduce_key_val.hpp
index a84e0c2..a84e0c2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/reduce_key_val.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/reduce_key_val.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/transform_detail.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/transform_detail.hpp
index 10da593..10da593 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/transform_detail.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/transform_detail.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/type_traits_detail.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/type_traits_detail.hpp
index 97ff00d..97ff00d 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/type_traits_detail.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/type_traits_detail.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/vec_distance_detail.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/vec_distance_detail.hpp
index 78ab556..78ab556 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/detail/vec_distance_detail.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/detail/vec_distance_detail.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/dynamic_smem.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/dynamic_smem.hpp
index cf431d9..cf431d9 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/dynamic_smem.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/dynamic_smem.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/emulation.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/emulation.hpp
index bf47bc5..bf47bc5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/emulation.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/emulation.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/filters.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/filters.hpp
index d193969..d193969 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/filters.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/filters.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/funcattrib.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/funcattrib.hpp
index 2ed7980..2ed7980 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/funcattrib.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/funcattrib.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/functional.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/functional.hpp
index db26473..db26473 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/functional.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/functional.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/limits.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/limits.hpp
index 5959780..5959780 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/limits.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/limits.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/reduce.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/reduce.hpp
index 2161b06..2161b06 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/reduce.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/reduce.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/saturate_cast.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/saturate_cast.hpp
index 7a2799f..7a2799f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/saturate_cast.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/saturate_cast.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/scan.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/scan.hpp
index 3d8da16..3d8da16 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/scan.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/scan.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/simd_functions.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/simd_functions.hpp
index b0377e5..b0377e5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/simd_functions.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/simd_functions.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/static_check.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/static_check.hpp
index e77691b..e77691b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/static_check.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/static_check.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/transform.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/transform.hpp
index 636caac..636caac 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/transform.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/transform.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/type_traits.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/type_traits.hpp
index 1b36acc..1b36acc 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/type_traits.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/type_traits.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/utility.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/utility.hpp
index 85e81ac..85e81ac 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/utility.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/utility.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_distance.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_distance.hpp
index d5b4bb2..d5b4bb2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_distance.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_distance.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_math.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_math.hpp
index a6cb43a..a6cb43a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_math.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_math.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_traits.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_traits.hpp
index 8d179c8..8d179c8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/vec_traits.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/vec_traits.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp.hpp
index 0f1dc79..0f1dc79 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp_reduce.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp_reduce.hpp
index d4e64c4..d4e64c4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp_reduce.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp_reduce.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp_shuffle.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp_shuffle.hpp
index 8b4479a..8b4479a 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/device/warp_shuffle.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/device/warp_shuffle.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/devmem2d.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/devmem2d.hpp
index 18dfcd8..18dfcd8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/devmem2d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/devmem2d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/gpu.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/gpu.hpp
index de16982..de16982 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/gpu.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/gpu.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/gpumat.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/gpumat.hpp
index 840398b..840398b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/gpumat.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/gpumat.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/gpu/stream_accessor.hpp b/thirdparty/includes/OpenCV/opencv2/gpu/stream_accessor.hpp
index bcd58ba..bcd58ba 100644
--- a/thirdparty/raspberrypi/includes/opencv2/gpu/stream_accessor.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/gpu/stream_accessor.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/highgui.hpp b/thirdparty/includes/OpenCV/opencv2/highgui.hpp
index c76a020..c76a020 100644
--- a/thirdparty/raspberrypi/includes/opencv2/highgui.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/highgui.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/highgui/cap_ios.h b/thirdparty/includes/OpenCV/opencv2/highgui/cap_ios.h
index 4c931d4..4c931d4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/highgui/cap_ios.h
+++ b/thirdparty/includes/OpenCV/opencv2/highgui/cap_ios.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/highgui/highgui.hpp b/thirdparty/includes/OpenCV/opencv2/highgui/highgui.hpp
index f6f2293..f6f2293 100644
--- a/thirdparty/raspberrypi/includes/opencv2/highgui/highgui.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/highgui/highgui.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/highgui/highgui_c.h b/thirdparty/includes/OpenCV/opencv2/highgui/highgui_c.h
index 85a59bb..85a59bb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/highgui/highgui_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/highgui/highgui_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/highgui/ios.h b/thirdparty/includes/OpenCV/opencv2/highgui/ios.h
index a7f0395..a7f0395 100644
--- a/thirdparty/raspberrypi/includes/opencv2/highgui/ios.h
+++ b/thirdparty/includes/OpenCV/opencv2/highgui/ios.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/imgproc.hpp b/thirdparty/includes/OpenCV/opencv2/imgproc.hpp
index 112f723..112f723 100644
--- a/thirdparty/raspberrypi/includes/opencv2/imgproc.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/imgproc.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/imgproc/imgproc.hpp b/thirdparty/includes/OpenCV/opencv2/imgproc/imgproc.hpp
index aa6a5f6..aa6a5f6 100644
--- a/thirdparty/raspberrypi/includes/opencv2/imgproc/imgproc.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/imgproc/imgproc.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/imgproc/imgproc_c.h b/thirdparty/includes/OpenCV/opencv2/imgproc/imgproc_c.h
index 46d9f01..46d9f01 100644
--- a/thirdparty/raspberrypi/includes/opencv2/imgproc/imgproc_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/imgproc/imgproc_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/imgproc/types_c.h b/thirdparty/includes/OpenCV/opencv2/imgproc/types_c.h
index 4aba0a8..4aba0a8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/imgproc/types_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/imgproc/types_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/legacy/blobtrack.hpp b/thirdparty/includes/OpenCV/opencv2/legacy/blobtrack.hpp
index 496b8be..496b8be 100644
--- a/thirdparty/raspberrypi/includes/opencv2/legacy/blobtrack.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/legacy/blobtrack.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/legacy/compat.hpp b/thirdparty/includes/OpenCV/opencv2/legacy/compat.hpp
index 5b5495e..5b5495e 100644
--- a/thirdparty/raspberrypi/includes/opencv2/legacy/compat.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/legacy/compat.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/legacy/legacy.hpp b/thirdparty/includes/OpenCV/opencv2/legacy/legacy.hpp
index 96da25c..96da25c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/legacy/legacy.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/legacy/legacy.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/legacy/streams.hpp b/thirdparty/includes/OpenCV/opencv2/legacy/streams.hpp
index e164bf4..e164bf4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/legacy/streams.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/legacy/streams.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ml.hpp b/thirdparty/includes/OpenCV/opencv2/ml.hpp
index dc62dcb..dc62dcb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ml.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ml.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ml/ml.hpp b/thirdparty/includes/OpenCV/opencv2/ml/ml.hpp
index d86ecde..d86ecde 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ml/ml.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ml/ml.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/nonfree/features2d.hpp b/thirdparty/includes/OpenCV/opencv2/nonfree/features2d.hpp
index f23bec8..f23bec8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/nonfree/features2d.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/nonfree/features2d.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/nonfree/gpu.hpp b/thirdparty/includes/OpenCV/opencv2/nonfree/gpu.hpp
index 722ef26..722ef26 100644
--- a/thirdparty/raspberrypi/includes/opencv2/nonfree/gpu.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/nonfree/gpu.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/nonfree/nonfree.hpp b/thirdparty/includes/OpenCV/opencv2/nonfree/nonfree.hpp
index c64c566..c64c566 100644
--- a/thirdparty/raspberrypi/includes/opencv2/nonfree/nonfree.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/nonfree/nonfree.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/nonfree/ocl.hpp b/thirdparty/includes/OpenCV/opencv2/nonfree/ocl.hpp
index ba84d24..ba84d24 100644
--- a/thirdparty/raspberrypi/includes/opencv2/nonfree/ocl.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/nonfree/ocl.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/objdetect.hpp b/thirdparty/includes/OpenCV/opencv2/objdetect.hpp
index 71f201c..71f201c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/objdetect.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/objdetect.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/objdetect/objdetect.hpp b/thirdparty/includes/OpenCV/opencv2/objdetect/objdetect.hpp
index d5d6f0b..d5d6f0b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/objdetect/objdetect.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/objdetect/objdetect.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ocl/matrix_operations.hpp b/thirdparty/includes/OpenCV/opencv2/ocl/matrix_operations.hpp
index d6f3bb4..d6f3bb4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ocl/matrix_operations.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ocl/matrix_operations.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ocl/ocl.hpp b/thirdparty/includes/OpenCV/opencv2/ocl/ocl.hpp
index e8eb3e8..e8eb3e8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ocl/ocl.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ocl/ocl.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/opencv.hpp b/thirdparty/includes/OpenCV/opencv2/opencv.hpp
index f76da92..f76da92 100644
--- a/thirdparty/raspberrypi/includes/opencv2/opencv.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/opencv.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/opencv_modules.hpp b/thirdparty/includes/OpenCV/opencv2/opencv_modules.hpp
index 4425eec..4425eec 100644
--- a/thirdparty/raspberrypi/includes/opencv2/opencv_modules.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/opencv_modules.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/photo.hpp b/thirdparty/includes/OpenCV/opencv2/photo.hpp
index 521a1ad..521a1ad 100644
--- a/thirdparty/raspberrypi/includes/opencv2/photo.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/photo.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/photo/photo.hpp b/thirdparty/includes/OpenCV/opencv2/photo/photo.hpp
index 6697377..6697377 100644
--- a/thirdparty/raspberrypi/includes/opencv2/photo/photo.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/photo/photo.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/photo/photo_c.h b/thirdparty/includes/OpenCV/opencv2/photo/photo_c.h
index 4ca05f2..4ca05f2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/photo/photo_c.h
+++ b/thirdparty/includes/OpenCV/opencv2/photo/photo_c.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching.hpp b/thirdparty/includes/OpenCV/opencv2/stitching.hpp
index ed65bb3..ed65bb3 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/autocalib.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/autocalib.hpp
index feb5349..feb5349 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/autocalib.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/autocalib.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/blenders.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/blenders.hpp
index bd93a71..bd93a71 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/blenders.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/blenders.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/camera.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/camera.hpp
index a74abcb..a74abcb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/camera.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/camera.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/exposure_compensate.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/exposure_compensate.hpp
index 49676fe..49676fe 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/exposure_compensate.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/exposure_compensate.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/matchers.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/matchers.hpp
index f319df1..f319df1 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/matchers.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/matchers.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/motion_estimators.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/motion_estimators.hpp
index 9ae1102..9ae1102 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/motion_estimators.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/motion_estimators.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/seam_finders.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/seam_finders.hpp
index 5b1d5d9..5b1d5d9 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/seam_finders.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/seam_finders.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/util.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/util.hpp
index a8ba816..a8ba816 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/util.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/util.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/util_inl.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/util_inl.hpp
index ab5d94b..ab5d94b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/util_inl.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/util_inl.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/warpers.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/warpers.hpp
index 60d5e54..60d5e54 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/warpers.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/warpers.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/warpers_inl.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/detail/warpers_inl.hpp
index b112123..b112123 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/detail/warpers_inl.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/detail/warpers_inl.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/stitcher.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/stitcher.hpp
index e274deb..e274deb 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/stitcher.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/stitcher.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/stitching/warpers.hpp b/thirdparty/includes/OpenCV/opencv2/stitching/warpers.hpp
index 11e012f..11e012f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/stitching/warpers.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/stitching/warpers.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/superres.hpp b/thirdparty/includes/OpenCV/opencv2/superres.hpp
index 8c344ca..8c344ca 100644
--- a/thirdparty/raspberrypi/includes/opencv2/superres.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/superres.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/superres/optical_flow.hpp b/thirdparty/includes/OpenCV/opencv2/superres/optical_flow.hpp
index d51ce79..d51ce79 100644
--- a/thirdparty/raspberrypi/includes/opencv2/superres/optical_flow.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/superres/optical_flow.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/superres/superres.hpp b/thirdparty/includes/OpenCV/opencv2/superres/superres.hpp
index 8daeb5b..8daeb5b 100644
--- a/thirdparty/raspberrypi/includes/opencv2/superres/superres.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/superres/superres.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts.hpp b/thirdparty/includes/OpenCV/opencv2/ts.hpp
index e96b101..e96b101 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ts.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts/gpu_perf.hpp b/thirdparty/includes/OpenCV/opencv2/ts/gpu_perf.hpp
index 87f1737..87f1737 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts/gpu_perf.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ts/gpu_perf.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts/gpu_test.hpp b/thirdparty/includes/OpenCV/opencv2/ts/gpu_test.hpp
index 01737bc..01737bc 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts/gpu_test.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ts/gpu_test.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts/ts.hpp b/thirdparty/includes/OpenCV/opencv2/ts/ts.hpp
index d3c1765..d3c1765 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts/ts.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ts/ts.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts/ts_gtest.h b/thirdparty/includes/OpenCV/opencv2/ts/ts_gtest.h
index 75453d2..75453d2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts/ts_gtest.h
+++ b/thirdparty/includes/OpenCV/opencv2/ts/ts_gtest.h
diff --git a/thirdparty/raspberrypi/includes/opencv2/ts/ts_perf.hpp b/thirdparty/includes/OpenCV/opencv2/ts/ts_perf.hpp
index 1830906..1830906 100644
--- a/thirdparty/raspberrypi/includes/opencv2/ts/ts_perf.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/ts/ts_perf.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/video.hpp b/thirdparty/includes/OpenCV/opencv2/video.hpp
index be11ce4..be11ce4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/video.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/video.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/video/background_segm.hpp b/thirdparty/includes/OpenCV/opencv2/video/background_segm.hpp
index d2d068c..d2d068c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/video/background_segm.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/video/background_segm.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/video/tracking.hpp b/thirdparty/includes/OpenCV/opencv2/video/tracking.hpp
index f09be80..f09be80 100644
--- a/thirdparty/raspberrypi/includes/opencv2/video/tracking.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/video/tracking.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/video/video.hpp b/thirdparty/includes/OpenCV/opencv2/video/video.hpp
index 1dd96f5..1dd96f5 100644
--- a/thirdparty/raspberrypi/includes/opencv2/video/video.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/video/video.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab.hpp b/thirdparty/includes/OpenCV/opencv2/videostab.hpp
index 4334d5c..4334d5c 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/deblurring.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/deblurring.hpp
index a61f9ce..a61f9ce 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/deblurring.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/deblurring.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/fast_marching.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/fast_marching.hpp
index 23c5df3..23c5df3 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/fast_marching.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/fast_marching.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/fast_marching_inl.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/fast_marching_inl.hpp
index dc860c2..dc860c2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/fast_marching_inl.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/fast_marching_inl.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/frame_source.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/frame_source.hpp
index c22c0a4..c22c0a4 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/frame_source.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/frame_source.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/global_motion.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/global_motion.hpp
index f5f34b9..f5f34b9 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/global_motion.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/global_motion.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/inpainting.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/inpainting.hpp
index 8df60f7..8df60f7 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/inpainting.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/inpainting.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/log.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/log.hpp
index ce6fadf..ce6fadf 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/log.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/log.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/motion_stabilizing.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/motion_stabilizing.hpp
index de05ad2..de05ad2 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/motion_stabilizing.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/motion_stabilizing.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/optical_flow.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/optical_flow.hpp
index 2c1742f..2c1742f 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/optical_flow.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/optical_flow.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/stabilizer.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/stabilizer.hpp
index d1d5388..d1d5388 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/stabilizer.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/stabilizer.hpp
diff --git a/thirdparty/raspberrypi/includes/opencv2/videostab/videostab.hpp b/thirdparty/includes/OpenCV/opencv2/videostab/videostab.hpp
index 3ea34a8..3ea34a8 100644
--- a/thirdparty/raspberrypi/includes/opencv2/videostab/videostab.hpp
+++ b/thirdparty/includes/OpenCV/opencv2/videostab/videostab.hpp
diff --git a/thirdparty/raspberrypi/includes/wiringPi.h b/thirdparty/includes/WiringPi/wiringPi.h
index a5eea87..a5eea87 100644
--- a/thirdparty/raspberrypi/includes/wiringPi.h
+++ b/thirdparty/includes/WiringPi/wiringPi.h
diff --git a/thirdparty/raspberrypi/includes/wiringSerial.h b/thirdparty/includes/WiringPi/wiringSerial.h
index 430dc73..430dc73 100644
--- a/thirdparty/raspberrypi/includes/wiringSerial.h
+++ b/thirdparty/includes/WiringPi/wiringSerial.h
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libIlmImf.a b/thirdparty/lib/pc/linux/x64/OpenCV/libIlmImf.a
new file mode 100644
index 0000000..6d0a4f6
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libIlmImf.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/liblibjasper.a b/thirdparty/lib/pc/linux/x64/OpenCV/liblibjasper.a
new file mode 100644
index 0000000..d6b9ba9
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/liblibjasper.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/liblibjpeg.a b/thirdparty/lib/pc/linux/x64/OpenCV/liblibjpeg.a
new file mode 100644
index 0000000..bf4ade5
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/liblibjpeg.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/liblibpng.a b/thirdparty/lib/pc/linux/x64/OpenCV/liblibpng.a
new file mode 100644
index 0000000..1faca81
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/liblibpng.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/liblibtiff.a b/thirdparty/lib/pc/linux/x64/OpenCV/liblibtiff.a
new file mode 100644
index 0000000..0078039
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/liblibtiff.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_calib3d.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_calib3d.a
new file mode 100644
index 0000000..b45e1f0
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_calib3d.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_contrib.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_contrib.a
new file mode 100644
index 0000000..6d98d06
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_contrib.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_core.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_core.a
new file mode 100644
index 0000000..aa3b9cc
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_core.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_features2d.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_features2d.a
new file mode 100644
index 0000000..ca77857
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_features2d.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_flann.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_flann.a
new file mode 100644
index 0000000..89fff9c
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_flann.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_gpu.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_gpu.a
new file mode 100644
index 0000000..7eb500d
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_gpu.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_haartraining_engine.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_haartraining_engine.a
new file mode 100644
index 0000000..596f8a4
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_haartraining_engine.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_highgui.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_highgui.a
new file mode 100644
index 0000000..8b1b52a
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_highgui.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_imgproc.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_imgproc.a
new file mode 100644
index 0000000..51f5f9d
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_imgproc.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_legacy.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_legacy.a
new file mode 100644
index 0000000..5326c8d
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_legacy.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ml.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ml.a
new file mode 100644
index 0000000..c1166a1
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ml.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_nonfree.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_nonfree.a
new file mode 100644
index 0000000..496c159
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_nonfree.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_objdetect.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_objdetect.a
new file mode 100644
index 0000000..6da7310
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_objdetect.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ocl.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ocl.a
new file mode 100644
index 0000000..cdd97f1
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ocl.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_photo.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_photo.a
new file mode 100644
index 0000000..8446f17
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_photo.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_stitching.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_stitching.a
new file mode 100644
index 0000000..a4dadae
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_stitching.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_superres.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_superres.a
new file mode 100644
index 0000000..1f4693f
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_superres.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ts.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ts.a
new file mode 100644
index 0000000..4dd7c7a
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_ts.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_video.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_video.a
new file mode 100644
index 0000000..3d31921
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_video.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_videostab.a b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_videostab.a
new file mode 100644
index 0000000..88ae48f
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libopencv_videostab.a
diff --git a/thirdparty/lib/pc/linux/x64/OpenCV/libzlib.a b/thirdparty/lib/pc/linux/x64/OpenCV/libzlib.a
new file mode 100644
index 0000000..c46e963
--- /dev/null
+++ b/thirdparty/lib/pc/linux/x64/OpenCV/libzlib.a
diff --git a/thirdparty/raspberrypi/lib/libIlmImf.a b/thirdparty/lib/raspberrypi/libIlmImf.a
index 0d9631d..0d9631d 100644
--- a/thirdparty/raspberrypi/lib/libIlmImf.a
+++ b/thirdparty/lib/raspberrypi/libIlmImf.a
diff --git a/thirdparty/raspberrypi/lib/libcblas.a b/thirdparty/lib/raspberrypi/libcblas.a
index 7a460be..7a460be 100644
--- a/thirdparty/raspberrypi/lib/libcblas.a
+++ b/thirdparty/lib/raspberrypi/libcblas.a
diff --git a/thirdparty/raspberrypi/lib/libgfortran.a b/thirdparty/lib/raspberrypi/libgfortran.a
index 7aacee8..7aacee8 100644
--- a/thirdparty/raspberrypi/lib/libgfortran.a
+++ b/thirdparty/lib/raspberrypi/libgfortran.a
diff --git a/thirdparty/raspberrypi/lib/libgsl.a b/thirdparty/lib/raspberrypi/libgsl.a
index 1eb5d60..1eb5d60 100644
--- a/thirdparty/raspberrypi/lib/libgsl.a
+++ b/thirdparty/lib/raspberrypi/libgsl.a
diff --git a/thirdparty/raspberrypi/lib/libjasper.a b/thirdparty/lib/raspberrypi/libjasper.a
index 662e414..662e414 100644
--- a/thirdparty/raspberrypi/lib/libjasper.a
+++ b/thirdparty/lib/raspberrypi/libjasper.a
diff --git a/thirdparty/raspberrypi/lib/libjpeg.a b/thirdparty/lib/raspberrypi/libjpeg.a
index e30c70c..e30c70c 100644
--- a/thirdparty/raspberrypi/lib/libjpeg.a
+++ b/thirdparty/lib/raspberrypi/libjpeg.a
diff --git a/thirdparty/raspberrypi/lib/liblapack.a b/thirdparty/lib/raspberrypi/liblapack.a
index 726f2b9..726f2b9 100644
--- a/thirdparty/raspberrypi/lib/liblapack.a
+++ b/thirdparty/lib/raspberrypi/liblapack.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_calib3d.a b/thirdparty/lib/raspberrypi/libopencv_calib3d.a
index 5d69787..5d69787 100644
--- a/thirdparty/raspberrypi/lib/libopencv_calib3d.a
+++ b/thirdparty/lib/raspberrypi/libopencv_calib3d.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_contrib.a b/thirdparty/lib/raspberrypi/libopencv_contrib.a
index c2b4527..c2b4527 100644
--- a/thirdparty/raspberrypi/lib/libopencv_contrib.a
+++ b/thirdparty/lib/raspberrypi/libopencv_contrib.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_core.a b/thirdparty/lib/raspberrypi/libopencv_core.a
index 1a7056f..1a7056f 100644
--- a/thirdparty/raspberrypi/lib/libopencv_core.a
+++ b/thirdparty/lib/raspberrypi/libopencv_core.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_features2d.a b/thirdparty/lib/raspberrypi/libopencv_features2d.a
index 3bd21f2..3bd21f2 100644
--- a/thirdparty/raspberrypi/lib/libopencv_features2d.a
+++ b/thirdparty/lib/raspberrypi/libopencv_features2d.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_flann.a b/thirdparty/lib/raspberrypi/libopencv_flann.a
index b5648fc..b5648fc 100644
--- a/thirdparty/raspberrypi/lib/libopencv_flann.a
+++ b/thirdparty/lib/raspberrypi/libopencv_flann.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_gpu.a b/thirdparty/lib/raspberrypi/libopencv_gpu.a
index a3b093a..a3b093a 100644
--- a/thirdparty/raspberrypi/lib/libopencv_gpu.a
+++ b/thirdparty/lib/raspberrypi/libopencv_gpu.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_highgui.a b/thirdparty/lib/raspberrypi/libopencv_highgui.a
index 9b22dab..9b22dab 100644
--- a/thirdparty/raspberrypi/lib/libopencv_highgui.a
+++ b/thirdparty/lib/raspberrypi/libopencv_highgui.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_imgproc.a b/thirdparty/lib/raspberrypi/libopencv_imgproc.a
index 3ae1ca0..3ae1ca0 100644
--- a/thirdparty/raspberrypi/lib/libopencv_imgproc.a
+++ b/thirdparty/lib/raspberrypi/libopencv_imgproc.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_legacy.a b/thirdparty/lib/raspberrypi/libopencv_legacy.a
index 2d906d1..2d906d1 100644
--- a/thirdparty/raspberrypi/lib/libopencv_legacy.a
+++ b/thirdparty/lib/raspberrypi/libopencv_legacy.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_ml.a b/thirdparty/lib/raspberrypi/libopencv_ml.a
index 5f6c164..5f6c164 100644
--- a/thirdparty/raspberrypi/lib/libopencv_ml.a
+++ b/thirdparty/lib/raspberrypi/libopencv_ml.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_nonfree.a b/thirdparty/lib/raspberrypi/libopencv_nonfree.a
index 4f49c8d..4f49c8d 100644
--- a/thirdparty/raspberrypi/lib/libopencv_nonfree.a
+++ b/thirdparty/lib/raspberrypi/libopencv_nonfree.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_objdetect.a b/thirdparty/lib/raspberrypi/libopencv_objdetect.a
index 6b3ddad..6b3ddad 100644
--- a/thirdparty/raspberrypi/lib/libopencv_objdetect.a
+++ b/thirdparty/lib/raspberrypi/libopencv_objdetect.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_ocl.a b/thirdparty/lib/raspberrypi/libopencv_ocl.a
index f5a4b42..f5a4b42 100644
--- a/thirdparty/raspberrypi/lib/libopencv_ocl.a
+++ b/thirdparty/lib/raspberrypi/libopencv_ocl.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_photo.a b/thirdparty/lib/raspberrypi/libopencv_photo.a
index 998a80a..998a80a 100644
--- a/thirdparty/raspberrypi/lib/libopencv_photo.a
+++ b/thirdparty/lib/raspberrypi/libopencv_photo.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_stitching.a b/thirdparty/lib/raspberrypi/libopencv_stitching.a
index aa0b1d3..aa0b1d3 100644
--- a/thirdparty/raspberrypi/lib/libopencv_stitching.a
+++ b/thirdparty/lib/raspberrypi/libopencv_stitching.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_superres.a b/thirdparty/lib/raspberrypi/libopencv_superres.a
index d33df01..d33df01 100644
--- a/thirdparty/raspberrypi/lib/libopencv_superres.a
+++ b/thirdparty/lib/raspberrypi/libopencv_superres.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_ts.a b/thirdparty/lib/raspberrypi/libopencv_ts.a
index f701602..f701602 100644
--- a/thirdparty/raspberrypi/lib/libopencv_ts.a
+++ b/thirdparty/lib/raspberrypi/libopencv_ts.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_video.a b/thirdparty/lib/raspberrypi/libopencv_video.a
index c4a07bf..c4a07bf 100644
--- a/thirdparty/raspberrypi/lib/libopencv_video.a
+++ b/thirdparty/lib/raspberrypi/libopencv_video.a
diff --git a/thirdparty/raspberrypi/lib/libopencv_videostab.a b/thirdparty/lib/raspberrypi/libopencv_videostab.a
index e2c302d..e2c302d 100644
--- a/thirdparty/raspberrypi/lib/libopencv_videostab.a
+++ b/thirdparty/lib/raspberrypi/libopencv_videostab.a
diff --git a/thirdparty/raspberrypi/lib/libpng.a b/thirdparty/lib/raspberrypi/libpng.a
index 937cc22..937cc22 100644
--- a/thirdparty/raspberrypi/lib/libpng.a
+++ b/thirdparty/lib/raspberrypi/libpng.a
diff --git a/thirdparty/raspberrypi/lib/librefblas.a b/thirdparty/lib/raspberrypi/librefblas.a
index 300a0db..300a0db 100644
--- a/thirdparty/raspberrypi/lib/librefblas.a
+++ b/thirdparty/lib/raspberrypi/librefblas.a
diff --git a/thirdparty/raspberrypi/lib/libtiff.a b/thirdparty/lib/raspberrypi/libtiff.a
index 917d747..917d747 100644
--- a/thirdparty/raspberrypi/lib/libtiff.a
+++ b/thirdparty/lib/raspberrypi/libtiff.a
diff --git a/thirdparty/raspberrypi/lib/libwiringPi.so b/thirdparty/lib/raspberrypi/libwiringPi.so
index da4a81e..da4a81e 100644
--- a/thirdparty/raspberrypi/lib/libwiringPi.so
+++ b/thirdparty/lib/raspberrypi/libwiringPi.so
diff --git a/thirdparty/raspberrypi/lib/libzlib.a b/thirdparty/lib/raspberrypi/libzlib.a
index 5a64389..5a64389 100644
--- a/thirdparty/raspberrypi/lib/libzlib.a
+++ b/thirdparty/lib/raspberrypi/libzlib.a
diff --git a/thirdparty/raspberrypi/includes/ads1115.h b/thirdparty/raspberrypi/includes/ads1115.h
deleted file mode 100644
index 5c91735..0000000
--- a/thirdparty/raspberrypi/includes/ads1115.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * ads1115.c:
- *	Extend wiringPi with the ADS1115 I2C 16-bit ADC
- *	Copyright (c) 2016 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-// Constants for some of the internal functions
-
-//	Gain
-
-#define	ADS1115_GAIN_6		0
-#define	ADS1115_GAIN_4		1
-#define	ADS1115_GAIN_2		2
-#define	ADS1115_GAIN_1		3
-#define	ADS1115_GAIN_HALF	4
-#define	ADS1115_GAIN_QUARTER	5
-
-//	Data rate
-
-#define	ADS1115_DR_8		0
-#define	ADS1115_DR_16		1
-#define	ADS1115_DR_32		2
-#define	ADS1115_DR_64		3
-#define	ADS1115_DR_128		4
-#define	ADS1115_DR_250		5
-#define	ADS1115_DR_475		6
-#define	ADS1115_DR_860		7
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int ads1115Setup (int pinBase, int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/drcSerial.h b/thirdparty/raspberrypi/includes/drcSerial.h
deleted file mode 100644
index 29e988e..0000000
--- a/thirdparty/raspberrypi/includes/drcSerial.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * drcSerial.h:
- *	Extend wiringPi with the DRC Serial protocol (e.g. to Arduino)
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int drcSetupSerial (const int pinBase, const int numPins, const char *device, const int baud) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/max31855.h b/thirdparty/raspberrypi/includes/max31855.h
deleted file mode 100644
index 385c4bd..0000000
--- a/thirdparty/raspberrypi/includes/max31855.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * max31855.c:
- *	Extend wiringPi with the MAX31855 SPI Thermocouple driver
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int max31855Setup (int pinBase, int spiChannel) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/max5322.h b/thirdparty/raspberrypi/includes/max5322.h
deleted file mode 100644
index a217cf8..0000000
--- a/thirdparty/raspberrypi/includes/max5322.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * max5322.h:
- *	Extend wiringPi with the MAX5322 SPI Digital to Analog convertor
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int max5322Setup (int pinBase, int spiChannel) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23008.h b/thirdparty/raspberrypi/includes/mcp23008.h
deleted file mode 100644
index e9299a8..0000000
--- a/thirdparty/raspberrypi/includes/mcp23008.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 23008.h:
- *	Extend wiringPi with the MCP 23008 I2C GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp23008Setup (const int pinBase, const int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23016.h b/thirdparty/raspberrypi/includes/mcp23016.h
deleted file mode 100644
index f9b5cc5..0000000
--- a/thirdparty/raspberrypi/includes/mcp23016.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * mcp23016.h:
- *	Extend wiringPi with the MCP 23016 I2C GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp23016Setup (const int pinBase, const int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23016reg.h b/thirdparty/raspberrypi/includes/mcp23016reg.h
deleted file mode 100644
index 9aea92d..0000000
--- a/thirdparty/raspberrypi/includes/mcp23016reg.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * mcp23016:
- *	Copyright (c) 2012-2013 Gordon Henderson
- *
- *	Header file for code using the MCP23016 GPIO expander
- *	chip.
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-// MCP23016 Registers
-
-#define	MCP23016_GP0		0x00
-#define	MCP23016_GP1		0x01
-#define	MCP23016_OLAT0		0x02
-#define	MCP23016_OLAT1		0x03
-#define	MCP23016_IPOL0		0x04
-#define	MCP23016_IPOL1		0x05
-#define	MCP23016_IODIR0		0x06
-#define	MCP23016_IODIR1		0x07
-#define	MCP23016_INTCAP0	0x08
-#define	MCP23016_INTCAP1	0x09
-#define	MCP23016_IOCON0		0x0A
-#define	MCP23016_IOCON1		0x0B
-
-// Bits in the IOCON register
-
-#define	IOCON_IARES	0x01
-
-// Default initialisation mode
-
-#define	IOCON_INIT	0
diff --git a/thirdparty/raspberrypi/includes/mcp23017.h b/thirdparty/raspberrypi/includes/mcp23017.h
deleted file mode 100644
index 79b4d7b..0000000
--- a/thirdparty/raspberrypi/includes/mcp23017.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 23017.h:
- *	Extend wiringPi with the MCP 23017 I2C GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp23017Setup (const int pinBase, const int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23s08.h b/thirdparty/raspberrypi/includes/mcp23s08.h
deleted file mode 100644
index ebf93d1..0000000
--- a/thirdparty/raspberrypi/includes/mcp23s08.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 23s08.h:
- *	Extend wiringPi with the MCP 23s08 SPI GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp23s08Setup (const int pinBase, const int spiPort, const int devId) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23s17.h b/thirdparty/raspberrypi/includes/mcp23s17.h
deleted file mode 100644
index 3b2a808..0000000
--- a/thirdparty/raspberrypi/includes/mcp23s17.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 23s17.h:
- *	Extend wiringPi with the MCP 23s17 SPI GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp23s17Setup (int pinBase, int spiPort, int devId) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp23x08.h b/thirdparty/raspberrypi/includes/mcp23x08.h
deleted file mode 100644
index c4e6b27..0000000
--- a/thirdparty/raspberrypi/includes/mcp23x08.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * mcp23x17:
- *	Copyright (c) 2012-2013 Gordon Henderson
- *
- *	Header file for code using the MCP23x17 GPIO expander chip.
- *	This comes in 2 flavours: MCP23017 which has an I2C interface,
- *	an the MXP23S17 which has an SPI interface.
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-
-// MCP23x17 Registers
-
-#define	IODIRA		0x00
-#define	IPOLA		0x02
-#define	GPINTENA	0x04
-#define	DEFVALA		0x06
-#define	INTCONA		0x08
-#define	IOCON		0x0A
-#define	GPPUA		0x0C
-#define	INTFA		0x0E
-#define	INTCAPA		0x10
-#define	GPIOA		0x12
-#define	OLATA		0x14
-
-#define	IODIRB		0x01
-#define	IPOLB		0x03
-#define	GPINTENB	0x05
-#define	DEFVALB		0x07
-#define	INTCONB		0x09
-#define	IOCONB		0x0B
-#define	GPPUB		0x0D
-#define	INTFB		0x0F
-#define	INTCAPB		0x11
-#define	GPIOB		0x13
-#define	OLATB		0x15
-
-// Bits in the IOCON register
-
-#define	IOCON_UNUSED	0x01
-#define	IOCON_INTPOL	0x02
-#define	IOCON_ODR	0x04
-#define	IOCON_HAEN	0x08
-#define	IOCON_DISSLW	0x10
-#define	IOCON_SEQOP	0x20
-#define	IOCON_MIRROR	0x40
-#define	IOCON_BANK_MODE	0x80
-
-// Default initialisation mode
-
-#define	IOCON_INIT	(IOCON_SEQOP)
-
-// SPI Command codes
-
-#define	CMD_WRITE	0x40
-#define CMD_READ	0x41
diff --git a/thirdparty/raspberrypi/includes/mcp23x0817.h b/thirdparty/raspberrypi/includes/mcp23x0817.h
deleted file mode 100644
index 58bc038..0000000
--- a/thirdparty/raspberrypi/includes/mcp23x0817.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * mcp23xxx:
- *	Copyright (c) 2012-2013 Gordon Henderson
- *
- *	Header file for code using the MCP23x08 and 17 GPIO expander
- *	chips.
- *	This comes in 2 flavours: MCP230xx (08/17) which has an I2C
- *	interface, and the MXP23Sxx (08/17) which has an SPI interface.
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-// MCP23x08 Registers
-	
-#define	MCP23x08_IODIR		0x00
-#define	MCP23x08_IPOL		0x01
-#define	MCP23x08_GPINTEN	0x02
-#define	MCP23x08_DEFVAL		0x03
-#define	MCP23x08_INTCON		0x04
-#define	MCP23x08_IOCON		0x05
-#define	MCP23x08_GPPU		0x06
-#define	MCP23x08_INTF		0x07
-#define	MCP23x08_INTCAP		0x08
-#define	MCP23x08_GPIO		0x09
-#define	MCP23x08_OLAT		0x0A
-
-// MCP23x17 Registers
-
-#define	MCP23x17_IODIRA		0x00
-#define	MCP23x17_IPOLA		0x02
-#define	MCP23x17_GPINTENA	0x04
-#define	MCP23x17_DEFVALA	0x06
-#define	MCP23x17_INTCONA	0x08
-#define	MCP23x17_IOCON		0x0A
-#define	MCP23x17_GPPUA		0x0C
-#define	MCP23x17_INTFA		0x0E
-#define	MCP23x17_INTCAPA	0x10
-#define	MCP23x17_GPIOA		0x12
-#define	MCP23x17_OLATA		0x14
-
-#define	MCP23x17_IODIRB		0x01
-#define	MCP23x17_IPOLB		0x03
-#define	MCP23x17_GPINTENB	0x05
-#define	MCP23x17_DEFVALB	0x07
-#define	MCP23x17_INTCONB	0x09
-#define	MCP23x17_IOCONB		0x0B
-#define	MCP23x17_GPPUB		0x0D
-#define	MCP23x17_INTFB		0x0F
-#define	MCP23x17_INTCAPB	0x11
-#define	MCP23x17_GPIOB		0x13
-#define	MCP23x17_OLATB		0x15
-
-// Bits in the IOCON register
-
-#define	IOCON_UNUSED	0x01
-#define	IOCON_INTPOL	0x02
-#define	IOCON_ODR	0x04
-#define	IOCON_HAEN	0x08
-#define	IOCON_DISSLW	0x10
-#define	IOCON_SEQOP	0x20
-#define	IOCON_MIRROR	0x40
-#define	IOCON_BANK_MODE	0x80
-
-// Default initialisation mode
-
-#define	IOCON_INIT	(IOCON_SEQOP)
-
-// SPI Command codes
-
-#define	CMD_WRITE	0x40
-#define CMD_READ	0x41
diff --git a/thirdparty/raspberrypi/includes/mcp3002.h b/thirdparty/raspberrypi/includes/mcp3002.h
deleted file mode 100644
index 0cd727f..0000000
--- a/thirdparty/raspberrypi/includes/mcp3002.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * mcp3002.c:
- *	Extend wiringPi with the MCP3002 SPI Analog to Digital convertor
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp3002Setup (int pinBase, int spiChannel) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp3004.h b/thirdparty/raspberrypi/includes/mcp3004.h
deleted file mode 100644
index a07c0bf..0000000
--- a/thirdparty/raspberrypi/includes/mcp3004.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * mcp3004.c:
- *	Extend wiringPi with the MCP3004 SPI Analog to Digital convertor
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp3004Setup (int pinBase, int spiChannel) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp3422.h b/thirdparty/raspberrypi/includes/mcp3422.h
deleted file mode 100644
index 72647d4..0000000
--- a/thirdparty/raspberrypi/includes/mcp3422.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * mcp3422.h:
- *	Extend wiringPi with the MCP3422/3/4 I2C ADC chip
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#define	MCP3422_SR_240	0
-#define	MCP3422_SR_60	1
-#define	MCP3422_SR_15	2
-#define	MCP3422_SR_3_75	3
-
-#define	MCP3422_GAIN_1	0
-#define	MCP3422_GAIN_2	1
-#define	MCP3422_GAIN_4	2
-#define	MCP3422_GAIN_8	3
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp3422Setup (int pinBase, int i2cAddress, int sampleRate, int gain) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/mcp4802.h b/thirdparty/raspberrypi/includes/mcp4802.h
deleted file mode 100644
index effa024..0000000
--- a/thirdparty/raspberrypi/includes/mcp4802.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * mcp4802.c:
- *	Extend wiringPi with the MCP4802 SPI Digital to Analog convertor
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int mcp4802Setup (int pinBase, int spiChannel) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/pcf8574.h b/thirdparty/raspberrypi/includes/pcf8574.h
deleted file mode 100644
index 8e2d818..0000000
--- a/thirdparty/raspberrypi/includes/pcf8574.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * pcf8574.h:
- *	Extend wiringPi with the PCF8574 I2C GPIO expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int pcf8574Setup (const int pinBase, const int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/pcf8591.h b/thirdparty/raspberrypi/includes/pcf8591.h
deleted file mode 100644
index 6b44ccf..0000000
--- a/thirdparty/raspberrypi/includes/pcf8591.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * pcf8591.h:
- *	Extend wiringPi with the PCF8591 I2C GPIO Analog expander chip
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int pcf8591Setup (const int pinBase, const int i2cAddress) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/sn3218.h b/thirdparty/raspberrypi/includes/sn3218.h
deleted file mode 100644
index 580d5f9..0000000
--- a/thirdparty/raspberrypi/includes/sn3218.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * sn3218.c:
- *	Extend wiringPi with the SN3218 I2C LED driver board.
- *	Copyright (c) 2012-2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int sn3218Setup (int pinBase) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/softPwm.h b/thirdparty/raspberrypi/includes/softPwm.h
deleted file mode 100644
index 0351da5..0000000
--- a/thirdparty/raspberrypi/includes/softPwm.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * softPwm.h:
- *	Provide 2 channels of software driven PWM.
- *	Copyright (c) 2012 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int  softPwmCreate (int pin, int value, int range) ;
-extern void softPwmWrite  (int pin, int value) ;
-extern void softPwmStop   (int pin) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/softServo.h b/thirdparty/raspberrypi/includes/softServo.h
deleted file mode 100644
index 794cf55..0000000
--- a/thirdparty/raspberrypi/includes/softServo.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * softServo.h:
- *	Provide N channels of software driven PWM suitable for RC
- *	servo motors.
- *	Copyright (c) 2012 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void softServoWrite  (int pin, int value) ;
-extern int softServoSetup   (int p0, int p1, int p2, int p3, int p4, int p5, int p6, int p7) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/softTone.h b/thirdparty/raspberrypi/includes/softTone.h
deleted file mode 100644
index a93c5af..0000000
--- a/thirdparty/raspberrypi/includes/softTone.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * softTone.c:
- *	For that authentic retro sound...
- *	Er... A little experiment to produce tones out of a Pi using
- *	one (or 2) GPIO pins and a piezeo "speaker" element.
- *	(Or a high impedance speaker, but don'y blame me if you blow-up
- *	the GPIO pins!)
- *	Copyright (c) 2012 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int  softToneCreate (int pin) ;
-extern void softToneStop   (int pin) ;
-extern void softToneWrite  (int pin, int freq) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/sr595.h b/thirdparty/raspberrypi/includes/sr595.h
deleted file mode 100644
index 4a26dc7..0000000
--- a/thirdparty/raspberrypi/includes/sr595.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * sr595.h:
- *	Extend wiringPi with the 74x595 shift registers.
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int sr595Setup (const int pinBase, const int numPins,
-	const int dataPin, const int clockPin, const int latchPin) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/wiringPiI2C.h b/thirdparty/raspberrypi/includes/wiringPiI2C.h
deleted file mode 100644
index 6db8c68..0000000
--- a/thirdparty/raspberrypi/includes/wiringPiI2C.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * wiringPiI2C.h:
- *	Simplified I2C access routines
- *	Copyright (c) 2013 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int wiringPiI2CRead           (int fd) ;
-extern int wiringPiI2CReadReg8       (int fd, int reg) ;
-extern int wiringPiI2CReadReg16      (int fd, int reg) ;
-
-extern int wiringPiI2CWrite          (int fd, int data) ;
-extern int wiringPiI2CWriteReg8      (int fd, int reg, int data) ;
-extern int wiringPiI2CWriteReg16     (int fd, int reg, int data) ;
-
-extern int wiringPiI2CSetupInterface (const char *device, int devId) ;
-extern int wiringPiI2CSetup          (const int devId) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/wiringPiSPI.h b/thirdparty/raspberrypi/includes/wiringPiSPI.h
deleted file mode 100644
index 3980321..0000000
--- a/thirdparty/raspberrypi/includes/wiringPiSPI.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * wiringPiSPI.h:
- *	Simplified SPI access routines
- *	Copyright (c) 2012-2015 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with wiringPi.
- *    If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int wiringPiSPIGetFd     (int channel) ;
-int wiringPiSPIDataRW    (int channel, unsigned char *data, int len) ;
-int wiringPiSPISetupMode (int channel, int speed, int mode) ;
-int wiringPiSPISetup     (int channel, int speed) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/wiringShift.h b/thirdparty/raspberrypi/includes/wiringShift.h
deleted file mode 100644
index 419ade4..0000000
--- a/thirdparty/raspberrypi/includes/wiringShift.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * wiringShift.h:
- *	Emulate some of the Arduino wiring functionality. 
- *
- * Copyright (c) 2009-2012 Gordon Henderson.
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, either version 3 of the License, or
- *    (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-#define	LSBFIRST	0
-#define	MSBFIRST	1
-
-#ifndef	_STDINT_H
-#  include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern uint8_t shiftIn      (uint8_t dPin, uint8_t cPin, uint8_t order) ;
-extern void    shiftOut     (uint8_t dPin, uint8_t cPin, uint8_t order, uint8_t val) ;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/thirdparty/raspberrypi/includes/wpiExtensions.h b/thirdparty/raspberrypi/includes/wpiExtensions.h
deleted file mode 100644
index fcaec96..0000000
--- a/thirdparty/raspberrypi/includes/wpiExtensions.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * extensions.h:
- *	Part of the GPIO program to test, peek, poke and otherwise
- *	noodle with the GPIO hardware on the Raspberry Pi.
- *	Copyright (c) 2012-2015 Gordon Henderson
- ***********************************************************************
- * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
- *
- *    wiringPi is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, either version 3 of the License, or
- *    (at your option) any later version.
- *
- *    wiringPi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- */
-
-
-extern int loadWPiExtension (char *progName, char *extensionData, int verbose) ;