diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/Makefile | 4 | ||||
| -rw-r--r-- | graphics/opencv/distinfo | 4 | ||||
| -rw-r--r-- | graphics/opencv/files/extra-patch-opencv | 10 | ||||
| -rw-r--r-- | graphics/opencv/files/extra-patch-opencv-core | 10 | ||||
| -rw-r--r-- | graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp (renamed from graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg.c) | 6 | ||||
| -rw-r--r-- | graphics/opencv/pkg-plist | 1 |
6 files changed, 15 insertions, 20 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 51186f568f59..588195cbae58 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= opencv -DISTVERSION= 2.3.0rc +PORTVERSION= 2.3.0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${DISTVERSION:R} DISTNAME= OpenCV-${DISTVERSION} @@ -216,6 +216,8 @@ post-patch: -e '/add_subdirectory(include)/ d' \ -e 's|opencv.pc|opencv-core.pc|g' \ -e 's|OpenCVConfig.cmake|OpenCVConfig-core.cmake|g' \ + -e 's| set(root_files README)||g' \ + -e 's| install(CODE "exec_program.*||g' \ ${WRKSRC}/CMakeLists.txt @${SED} -E -e \ 's|Name:.*|Name: OpenCV-core|' -e \ diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 54069954e9d8..76d75c225f07 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,2 +1,2 @@ -SHA256 (OpenCV-2.3.0rc.tar.bz2) = 2911e48379e073f95f6716c34692d2017b3a8e17e773100d626905056cb7c5b5 -SIZE (OpenCV-2.3.0rc.tar.bz2) = 40489828 +SHA256 (OpenCV-2.3.0.tar.bz2) = bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b +SIZE (OpenCV-2.3.0.tar.bz2) = 42849210 diff --git a/graphics/opencv/files/extra-patch-opencv b/graphics/opencv/files/extra-patch-opencv index 714e3f1bc2db..3d3fe1f8532e 100644 --- a/graphics/opencv/files/extra-patch-opencv +++ b/graphics/opencv/files/extra-patch-opencv @@ -1,6 +1,6 @@ ---- modules/CMakeLists.txt.orig 2011-06-27 13:43:54.557252854 +0200 -+++ modules/CMakeLists.txt 2011-06-27 13:44:14.656997882 +0200 -@@ -8,29 +8,29 @@ +--- modules/CMakeLists.txt.orig 2011-07-04 06:21:57.000000000 +0200 ++++ modules/CMakeLists.txt 2011-07-11 09:33:56.265459094 +0200 +@@ -8,25 +8,25 @@ endif() add_subdirectory(calib3d) @@ -10,10 +10,6 @@ -add_subdirectory(flann) +#add_subdirectory(flann) - if(MSVC OR MINGW) - add_subdirectory(ffmpeg) - endif() - if(BUILD_TESTS) - add_subdirectory(ts) +# add_subdirectory(ts) diff --git a/graphics/opencv/files/extra-patch-opencv-core b/graphics/opencv/files/extra-patch-opencv-core index 639e1c4949b6..5c41cc1f7504 100644 --- a/graphics/opencv/files/extra-patch-opencv-core +++ b/graphics/opencv/files/extra-patch-opencv-core @@ -1,6 +1,6 @@ ---- modules/CMakeLists.txt.orig 2011-06-21 15:24:05.000000000 +0200 -+++ modules/CMakeLists.txt 2011-06-27 13:29:25.803871762 +0200 -@@ -7,34 +7,34 @@ +--- modules/CMakeLists.txt.orig 2011-07-04 06:21:57.000000000 +0200 ++++ modules/CMakeLists.txt 2011-07-11 09:35:33.207215658 +0200 +@@ -7,30 +7,30 @@ add_subdirectory(androidcamera) endif() @@ -11,10 +11,6 @@ +#add_subdirectory(features2d) add_subdirectory(flann) - if(MSVC OR MINGW) - add_subdirectory(ffmpeg) - endif() - -if(BUILD_TESTS) +#if(BUILD_TESTS) add_subdirectory(ts) diff --git a/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg.c b/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp index 98f15cd2998c..41a9e9c944c1 100644 --- a/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg.c +++ b/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp @@ -1,6 +1,6 @@ ---- modules/highgui/src/cap_ffmpeg.cpp.orig 2011-06-21 15:24:06.000000000 +0200 -+++ modules/highgui/src/cap_ffmpeg.cpp 2011-06-27 08:36:37.096041264 +0200 -@@ -53,7 +53,8 @@ +--- modules/highgui/src/cap_ffmpeg_impl.hpp.orig 2011-07-11 09:39:11.188904113 +0200 ++++ modules/highgui/src/cap_ffmpeg_impl.hpp 2011-07-11 09:39:41.732624055 +0200 +@@ -57,7 +57,8 @@ #define UINT64_C #define __STDC_CONSTANT_MACROS // force re-inclusion of stdint.h to get INT64_C macro diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index 7ffb08fab0a8..309597071e1e 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -54,6 +54,7 @@ lib/libopencv_objdetect.so.2 lib/libopencv_objdetect.so.2.3.0 libdata/pkgconfig/opencv.pc %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv.so +share/OpenCV %%DATADIR%%/OpenCVConfig.cmake %%DATADIR%%/haarcascades/haarcascade_eye.xml %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml |