Fri Jun 1 21:24:57 2012 UTC ()
Add upstream bug report URLs.


(wiz)
diff -r1.11 -r1.12 pkgsrc/graphics/opencv/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp
cvs diff -r1.11 -r1.12 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2012/06/01 20:53:56 1.11
+++ pkgsrc/graphics/opencv/distinfo 2012/06/01 21:24:57 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2012/06/01 20:53:56 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2012/06/01 21:24:57 wiz Exp $
2 2
3SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56 3SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56
4RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501 4RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501
5Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes 5Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes
6SHA1 (patch-CMakeLists.txt) = d4a48460328c6ef30bd1abd9d90895d186758565 6SHA1 (patch-CMakeLists.txt) = 67660c0ed98db2c24b3348a47b5ea2d18903ed11
7SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = 3936d23ad51f82536bb73428754d131259b8bf05 7SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = ca4a861d0a1ac0c9416001ae9ed40cb0e924895a
cvs diff -r1.4 -r1.5 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt 2012/06/01 20:53:56 1.4
+++ pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt 2012/06/01 21:24:57 1.5
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-CMakeLists.txt,v 1.4 2012/06/01 20:53:56 wiz Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.5 2012/06/01 21:24:57 wiz Exp $
2 2
3Handle DragonFly like NetBSD and FreeBSD. 3Handle DragonFly like NetBSD and FreeBSD.
 4http://code.opencv.org/issues/2010
4 5
5--- CMakeLists.txt.orig 2012-05-31 14:06:56.000000000 +0000 6--- CMakeLists.txt.orig 2012-05-31 14:06:56.000000000 +0000
6+++ CMakeLists.txt 7+++ CMakeLists.txt
7@@ -318,7 +318,7 @@ if(UNIX) 8@@ -318,7 +318,7 @@ if(UNIX)
8 CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) 9 CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
9 if(ANDROID) 10 if(ANDROID)
10 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) 11 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
11- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") 12- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
12+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") 13+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
13 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread) 14 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
14 else() 15 else()
15 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) 16 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)
cvs diff -r1.1 -r1.2 pkgsrc/graphics/opencv/patches/Attic/patch-modules_core_include_opencv2_core_core.hpp (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/Attic/patch-modules_core_include_opencv2_core_core.hpp 2012/04/03 18:57:22 1.1
+++ pkgsrc/graphics/opencv/patches/Attic/patch-modules_core_include_opencv2_core_core.hpp 2012/06/01 21:24:57 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-modules_core_include_opencv2_core_core.hpp,v 1.1 2012/04/03 18:57:22 adam Exp $ 1$NetBSD: patch-modules_core_include_opencv2_core_core.hpp,v 1.2 2012/06/01 21:24:57 wiz Exp $
2 2
3Fix building on Mac OS X, where MIN and MAX got redefined by Obj-C headers. 3Fix building on Mac OS X, where MIN and MAX got redefined by Obj-C headers.
 4http://code.opencv.org/issues/2011
4 5
5--- modules/core/include/opencv2/core/core.hpp.orig 2012-04-03 17:44:46.000000000 +0000 6--- modules/core/include/opencv2/core/core.hpp.orig 2012-04-03 17:44:46.000000000 +0000
6+++ modules/core/include/opencv2/core/core.hpp 7+++ modules/core/include/opencv2/core/core.hpp
7@@ -46,6 +46,12 @@ 8@@ -46,6 +46,12 @@
8 #ifndef __OPENCV_CORE_HPP__ 9 #ifndef __OPENCV_CORE_HPP__
9 #define __OPENCV_CORE_HPP__ 10 #define __OPENCV_CORE_HPP__
10  11
11+// make sure these are defined correctly 12+// make sure these are defined correctly
12+#undef MIN 13+#undef MIN
13+#undef MAX 14+#undef MAX
14+#define MIN(a,b) (((a)<(b))?(a):(b)) 15+#define MIN(a,b) (((a)<(b))?(a):(b))
15+#define MAX(a,b) (((a)>(b))?(a):(b)) 16+#define MAX(a,b) (((a)>(b))?(a):(b))
16+ 17+