diff options
author | prlw1 <prlw1@pkgsrc.org> | 2012-07-13 18:13:59 +0000 |
---|---|---|
committer | prlw1 <prlw1@pkgsrc.org> | 2012-07-13 18:13:59 +0000 |
commit | 1528570a2ac8b5f94f53b2ac2789e2e811b992f7 (patch) | |
tree | 5f3871d0d0b7f2f126dbc37984a48dc2127420fb | |
parent | 9b60422ea05af1fa8368555dcf34a42eba665b07 (diff) | |
download | pkgsrc-1528570a2ac8b5f94f53b2ac2789e2e811b992f7.tar.gz |
Update OpenCV to 2.4.2, highlights include:
- New keypoint descriptor FREAK contributed by EPFL group
- Improved face recognizer class and tutorial added by Philipp Wagner
-rw-r--r-- | graphics/opencv/Makefile | 5 | ||||
-rw-r--r-- | graphics/opencv/distinfo | 9 | ||||
-rw-r--r-- | graphics/opencv/patches/patch-CMakeLists.txt | 16 |
3 files changed, 6 insertions, 24 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 34f15b4ed84..6864ab572da 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2012/06/06 13:56:48 adam Exp $ +# $NetBSD: Makefile,v 1.26 2012/07/13 18:13:59 prlw1 Exp $ -DISTNAME= OpenCV-2.4.1 +DISTNAME= OpenCV-2.4.2 PKGNAME= ${DISTNAME:S/OpenCV/opencv/:S/a$//} -PKGREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 0635b9df411..bb6f9beb403 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.13 2012/06/02 11:56:35 wiz Exp $ +$NetBSD: distinfo,v 1.14 2012/07/13 18:13:59 prlw1 Exp $ -SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56 -RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501 -Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes -SHA1 (patch-CMakeLists.txt) = 67660c0ed98db2c24b3348a47b5ea2d18903ed11 +SHA1 (OpenCV-2.4.2.tar.bz2) = 96ff27b87e0f028d1d16201afebabec4e0c72367 +RMD160 (OpenCV-2.4.2.tar.bz2) = 496964503629b0ff4432fbdd276837ab3f134411 +Size (OpenCV-2.4.2.tar.bz2) = 52562911 bytes diff --git a/graphics/opencv/patches/patch-CMakeLists.txt b/graphics/opencv/patches/patch-CMakeLists.txt deleted file mode 100644 index 66135869ca5..00000000000 --- a/graphics/opencv/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.5 2012/06/01 21:24:57 wiz Exp $ - -Handle DragonFly like NetBSD and FreeBSD. -http://code.opencv.org/issues/2010 - ---- CMakeLists.txt.orig 2012-05-31 14:06:56.000000000 +0000 -+++ CMakeLists.txt -@@ -318,7 +318,7 @@ if(UNIX) - CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) - if(ANDROID) - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) -- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") -+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread) - else() - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) |