From deb3e94d2de5a3b94a0da985fd440ab5fbda7c79 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 13 Oct 2015 14:37:42 +0000
Subject: Don't fetch 3rd party modules during build from the Internet. Don't
 require C++14 for no obvious reason.

---
 graphics/opencv/distinfo                                    |  4 +++-
 .../opencv/patches/patch-3rdparty_ippicv_downloader.cmake   | 12 ++++++++++++
 ...t_include_opencv_objdetect_detection__based__tracker.hpp | 13 +++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
 create mode 100644 graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp

(limited to 'graphics/opencv')

diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 9ed6e9708f3..b9c317cc914 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.30 2015/10/08 17:45:59 fhajny Exp $
+$NetBSD: distinfo,v 1.31 2015/10/13 14:37:42 joerg Exp $
 
 SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
 RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
 Size (opencv-3.0.0.zip) = 100980799 bytes
+SHA1 (patch-3rdparty_ippicv_downloader.cmake) = 8d99b26a39aa184a4dfc03e4928ea7b7b62e71d9
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = dba43f8252eda7807379469cf9359581bf4d41ad
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
+SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 2f4d2f43afe370eef748e05bec199bc963e1ecab
 SHA1 (patch-modules_python_common.cmake) = d6289a316712bb8be4d590965c87f6bb3525a938
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
diff --git a/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake b/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
new file mode 100644
index 00000000000..d47187abc79
--- /dev/null
+++ b/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
@@ -0,0 +1,12 @@
+$NetBSD: patch-3rdparty_ippicv_downloader.cmake,v 1.1 2015/10/13 14:37:43 joerg Exp $
+
+--- 3rdparty/ippicv/downloader.cmake.orig	2015-10-13 13:00:47.000000000 +0000
++++ 3rdparty/ippicv/downloader.cmake
+@@ -6,6 +6,7 @@
+ #
+ 
+ function(_icv_downloader)
++  return()
+   # Define actual ICV versions
+   if(APPLE)
+     set(OPENCV_ICV_PACKAGE_NAME "ippicv_macosx_20141027.tgz")
diff --git a/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp b/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
new file mode 100644
index 00000000000..0eac4343be8
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v 1.1 2015/10/13 14:37:43 joerg Exp $
+
+--- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig	2015-10-13 12:31:00.000000000 +0000
++++ modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
+@@ -45,7 +45,7 @@
+ #define __OPENCV_OBJDETECT_DBT_HPP__
+ 
+ #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
+-  (defined(__cplusplus) &&  __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
++  (defined(__cplusplus) &&  __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
+ 
+ #include <vector>
+ 
-- 
cgit v1.2.3