diff options
-rw-r--r-- | graphics/opencv/distinfo | 5 | ||||
-rw-r--r-- | graphics/opencv/patches/patch-CMakeLists.txt | 13 | ||||
-rw-r--r-- | graphics/opencv/patches/patch-aa | 4 |
3 files changed, 18 insertions, 4 deletions
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 7579448328f..ba160652c83 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.7 2011/01/24 14:37:51 wiz Exp $ +$NetBSD: distinfo,v 1.8 2011/12/14 18:27:22 marino Exp $ SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7 RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01 Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes -SHA1 (patch-aa) = 58ac9aef394eedaf0be9afd725820b1acf54cd36 +SHA1 (patch-CMakeLists.txt) = 3c58828d9122105942820320a44f54e93effa33a +SHA1 (patch-aa) = 3a95649075b2ca94d39ced3c00da6a90b5834881 SHA1 (patch-ab) = 66936658e5ec12c479c29388916edd399c7feca6 diff --git a/graphics/opencv/patches/patch-CMakeLists.txt b/graphics/opencv/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..bfff3f7644e --- /dev/null +++ b/graphics/opencv/patches/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2011/12/14 18:27:22 marino Exp $ + +--- CMakeLists.txt.orig 2010-12-05 03:35:23.000000000 +0000 ++++ CMakeLists.txt +@@ -464,7 +464,7 @@ if(UNIX) + endif()
+ endif()
+
+- if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+ set(OPENCV_LINKER_LIBS m pthread)
+ else()
+ set(OPENCV_LINKER_LIBS dl m pthread rt)
diff --git a/graphics/opencv/patches/patch-aa b/graphics/opencv/patches/patch-aa index a5a4db70727..f9abdfe6828 100644 --- a/graphics/opencv/patches/patch-aa +++ b/graphics/opencv/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2010/12/06 16:55:23 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2011/12/14 18:27:22 marino Exp $ NetBSD doesn't have expl(3) yet. https://code.ros.org/trac/opencv/ticket/736 @@ -10,7 +10,7 @@ https://code.ros.org/trac/opencv/ticket/736 static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float)
-#if ANDROID
-+#if defined(ANDROID) || defined(__NetBSD__)
++#if defined(ANDROID) || defined(__DragonFly__) || defined(__NetBSD__)
#define expl(x) exp(x)
#endif
|