Wed Dec 14 18:27:22 2011 UTC ()
graphics/opencv: Add support for DragonFly


(marino)
diff -r1.7 -r1.8 pkgsrc/graphics/opencv/distinfo
diff -r0 -r1.1 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
diff -r1.4 -r1.5 pkgsrc/graphics/opencv/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2011/01/24 14:37:51 1.7
+++ pkgsrc/graphics/opencv/distinfo 2011/12/14 18:27:22 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2011/01/24 14:37:51 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2011/12/14 18:27:22 marino Exp $
2 2
3SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7 3SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7
4RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01 4RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01
5Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes 5Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes
6SHA1 (patch-aa) = 58ac9aef394eedaf0be9afd725820b1acf54cd36 6SHA1 (patch-CMakeLists.txt) = 3c58828d9122105942820320a44f54e93effa33a
 7SHA1 (patch-aa) = 3a95649075b2ca94d39ced3c00da6a90b5834881
7SHA1 (patch-ab) = 66936658e5ec12c479c29388916edd399c7feca6 8SHA1 (patch-ab) = 66936658e5ec12c479c29388916edd399c7feca6
File Added: pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
$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)
cvs diff -r1.4 -r1.5 pkgsrc/graphics/opencv/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/Attic/patch-aa 2010/12/06 16:55:23 1.4
+++ pkgsrc/graphics/opencv/patches/Attic/patch-aa 2011/12/14 18:27:22 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.4 2010/12/06 16:55:23 wiz Exp $ 1$NetBSD: patch-aa,v 1.5 2011/12/14 18:27:22 marino Exp $
2 2
3NetBSD doesn't have expl(3) yet. 3NetBSD doesn't have expl(3) yet.
4https://code.ros.org/trac/opencv/ticket/736 4https://code.ros.org/trac/opencv/ticket/736
5 5
6--- modules/ml/src/gbt.cpp.orig 2010-12-05 03:35:25.000000000 +0000 6--- modules/ml/src/gbt.cpp.orig 2010-12-05 03:35:25.000000000 +0000
7+++ modules/ml/src/gbt.cpp 7+++ modules/ml/src/gbt.cpp
8@@ -11,7 +11,7 @@ using namespace std; 8@@ -11,7 +11,7 @@ using namespace std;
9 #define CV_CMP_FLOAT(a,b) ((a) < (b))  9 #define CV_CMP_FLOAT(a,b) ((a) < (b))
10 static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float)  10 static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float)
11  11
12-#if ANDROID  12-#if ANDROID
13+#if defined(ANDROID) || defined(__NetBSD__)  13+#if defined(ANDROID) || defined(__DragonFly__) || defined(__NetBSD__)
14 #define expl(x) exp(x)  14 #define expl(x) exp(x)
15 #endif  15 #endif
16  16