diff options
author | Jason E. Hale <jhale@FreeBSD.org> | 2014-09-02 00:36:27 +0000 |
---|---|---|
committer | Jason E. Hale <jhale@FreeBSD.org> | 2014-09-02 00:36:27 +0000 |
commit | 68669fc03d3fa88b970a6f23950ae18192f5366a (patch) | |
tree | f9c95e368a69a5958e29d6c404332b927b979bb0 /graphics/opencv | |
parent | 89ca9a777bdc3a3e800b54666e3ef2d2e217a202 (diff) | |
download | ports-68669fc03d3fa88b970a6f23950ae18192f5366a.tar.gz ports-68669fc03d3fa88b970a6f23950ae18192f5366a.zip |
Notes
Diffstat (limited to 'graphics/opencv')
-rw-r--r-- | graphics/opencv/Makefile | 56 | ||||
-rw-r--r-- | graphics/opencv/distinfo | 4 | ||||
-rw-r--r-- | graphics/opencv/files/patch-cmake__templates__OpenCVConfig.cmake.in | 11 | ||||
-rw-r--r-- | graphics/opencv/files/patch-modules__core__src__system.cpp | 4 |
4 files changed, 33 insertions, 42 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 894b7b3acd0b..1eb963a60e64 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -2,18 +2,18 @@ # $FreeBSD$ PORTNAME?= opencv -PORTVERSION= 2.4.7 -PORTREVISION?= 1 +PORTVERSION= 2.4.9 +PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} MAINTAINER= jhale@FreeBSD.org COMMENT= Open Source Computer Vision library -LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/doc/license.txt +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake pkgconfig +USES= cmake pkgconfig zip USE_LDCONFIG= yes WANT_GSTREAMER= yes MAKE_JOBS_UNSAFE= yes @@ -54,9 +54,6 @@ OPTIONS_SUB= yes .if defined(OCV_CORE) OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ OPENGL PNG TIFF FFMPEG GSTREAMER V4L XINE -.elif defined(OCV_PYTHON) -OPTIONS_EXCLUDE= DC1394 GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ - OPENGL PNG TIFF TBB EIGEN3 FFMPEG GSTREAMER V4L XINE .endif DC1394_DESC= IEEE 1394 camera support @@ -203,19 +200,17 @@ CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off LIB_DEPENDS+= libopencv_legacy.so:${PORTSDIR}/graphics/opencv BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} -USE_PYTHON= yes -CFLAGS+= -I${LOCALBASE}/include +USES+= python CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On -. for module in ${OCV_MODS} ${OCV_CORE_MODS} ${OCV_JAVA_MODS} +. for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor -CMAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" INSTALL_WRKSRC= ${WRKSRC}/modules/python .elif defined(OCV_JAVA) BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant LIB_DEPENDS+= libopencv_legacy.so:${PORTSDIR}/graphics/opencv +USES+= python:build USE_JAVA= yes -USE_PYTHON_BUILD= yes CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On . for module in apps python stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off @@ -233,40 +228,47 @@ post-patch: @${MKDIR} ${CONFIGURE_WRKSRC} @${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \ ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake - @${REINPLACE_CMD} -e 's|share/OpenCV/doc|share/doc/${PORTNAME}|g' \ + @${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \ + -e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \ ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|[Oo]pen[Cc][Vv]/samples|examples/${PORTNAME}|g' \ - ${WRKSRC}/samples/*/CMakeLists.txt \ - ${WRKSRC}/samples/*/*/CMakeLists.txt @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \; .if defined(OCV_CORE) @${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \ ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake @${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \ - ${WRKSRC}/cmake/templates/opencv-XXX.pc.cmake.in + ${WRKSRC}/cmake/templates/opencv-XXX.pc.in .endif -.if defined(OCV_PYTHON) -. for module in ${OCV_CORE_MODS} ${OCV_MODS} ${OCV_NONFREE_MODS} - @${REINPLACE_CMD} -e 's|opencv_${module} | |' \ - -e 's|opencv_${module}$$||' \ - -e 's|opencv_${module})|)|' \ - ${WRKSRC}/modules/*/CMakeLists.txt -. endfor - ${REINPLACE_CMD} -e '/[Ee][Xx][Pp][Oo][Rr][Tt]/d' \ - ${WRKSRC}/cmake/OpenCVGenConfig.cmake +.if defined(OCV_SLAVE) + @${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \ + ${WRKSRC}/CMakeLists.txt .endif post-install: +.if !defined(OCV_SLAVE) + (cd ${STAGEDIR}${PREFIX} && \ + ${RM} -r include/opencv2/core include/opencv2/imgproc \ + lib/libopencv_core* lib/libopencv_imgproc*) +.endif .if defined(OCV_CORE) + ${RM} -r ${STAGEDIR}${PREFIX}/include/opencv + ${RM} -r ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules .endif .if defined(OCV_PYTHON) + (cd ${STAGEDIR}${PREFIX} && \ + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||} && \ + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||}) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +. if defined(PYTHON_REL) && ${PYTHON_REL} >= 300 cd ${WRKSRC}/samples/python && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python +. else cd ${WRKSRC}/samples/python2 && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2 +. endif .endif .if defined(OCV_JAVA) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 65415bbd75e7..e0a7bd87e311 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,2 +1,2 @@ -SHA256 (opencv-2.4.7.tar.gz) = c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43 -SIZE (opencv-2.4.7.tar.gz) = 85587316 +SHA256 (opencv-2.4.9.zip) = 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 +SIZE (opencv-2.4.9.zip) = 91684751 diff --git a/graphics/opencv/files/patch-cmake__templates__OpenCVConfig.cmake.in b/graphics/opencv/files/patch-cmake__templates__OpenCVConfig.cmake.in deleted file mode 100644 index a4796f178c39..000000000000 --- a/graphics/opencv/files/patch-cmake__templates__OpenCVConfig.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./cmake/templates/OpenCVConfig.cmake.in.orig 2013-12-01 09:56:12.000000000 -0500 -+++ ./cmake/templates/OpenCVConfig.cmake.in 2013-12-01 09:56:42.000000000 -0500 -@@ -195,7 +195,7 @@ - set(OpenCV_LIB_SUFFIX "") - endif() - --SET(OpenCV_LIBS "${OpenCV_LIB_COMPONENTS}") -+SET(OpenCV_LIBS "${OpenCV_FIND_COMPONENTS}") - - foreach(__opttype OPT DBG) - SET(OpenCV_LIBS_${__opttype} "${OpenCV_LIBS}") diff --git a/graphics/opencv/files/patch-modules__core__src__system.cpp b/graphics/opencv/files/patch-modules__core__src__system.cpp index 52d8857f72da..88d9f7e75463 100644 --- a/graphics/opencv/files/patch-modules__core__src__system.cpp +++ b/graphics/opencv/files/patch-modules__core__src__system.cpp @@ -4,8 +4,8 @@ #include <stdarg.h> --#if defined __linux__ || defined __APPLE__ -+#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__ +-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ ++#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ #include <unistd.h> #include <stdio.h> #include <sys/types.h> |