Date: Tue, 2 Sep 2014 00:36:27 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366969 - in head/graphics: opencv opencv-core opencv-java opencv/files py-opencv Message-ID: <201409020036.s820aRSM067542@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Sep 2 00:36:27 2014 New Revision: 366969 URL: http://svnweb.freebsd.org/changeset/ports/366969 QAT: https://qat.redports.org/buildarchive/r366969/ Log: - Update to 2.4.9 - Update LICENSE - Convert USE_PYTHON -> USES Deleted: head/graphics/opencv/files/patch-cmake__templates__OpenCVConfig.cmake.in Modified: head/graphics/opencv-core/Makefile head/graphics/opencv-core/pkg-plist head/graphics/opencv-java/Makefile head/graphics/opencv-java/pkg-plist head/graphics/opencv/Makefile head/graphics/opencv/distinfo head/graphics/opencv/files/patch-modules__core__src__system.cpp head/graphics/py-opencv/Makefile head/graphics/py-opencv/pkg-plist Modified: head/graphics/opencv-core/Makefile ============================================================================== --- head/graphics/opencv-core/Makefile Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv-core/Makefile Tue Sep 2 00:36:27 2014 (r366969) @@ -1,7 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -${OCV_SLAVE} COMMENT= OpenCV core libraries Modified: head/graphics/opencv-core/pkg-plist ============================================================================== --- head/graphics/opencv-core/pkg-plist Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv-core/pkg-plist Tue Sep 2 00:36:27 2014 (r366969) @@ -1,3 +1,4 @@ +include/opencv2/core/affine.hpp include/opencv2/core/core.hpp include/opencv2/core/core_c.h include/opencv2/core/cuda_devptrs.hpp @@ -15,6 +16,8 @@ include/opencv2/core/wimage.hpp include/opencv2/imgproc/imgproc.hpp include/opencv2/imgproc/imgproc_c.h include/opencv2/imgproc/types_c.h +@comment include/opencv2/opencv.hpp +@comment include/opencv2/opencv_modules.hpp lib/libopencv_core.so lib/libopencv_core.so.2 lib/libopencv_core.so.%%VERSION%% @@ -23,8 +26,8 @@ lib/libopencv_imgproc.so.2 lib/libopencv_imgproc.so.%%VERSION%% libdata/pkgconfig/opencv-core.pc share/cmake/Modules/FindOpenCVCore.cmake +@dirrmtry include/opencv2/core +@dirrmtry include/opencv2/imgproc +@dirrmtry include/opencv2 @dirrmtry share/cmake/Modules @dirrmtry share/cmake -@dirrm include/opencv2/imgproc -@dirrm include/opencv2/core -@dirrmtry include/opencv2 Modified: head/graphics/opencv-java/Makefile ============================================================================== --- head/graphics/opencv-java/Makefile Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv-java/Makefile Tue Sep 2 00:36:27 2014 (r366969) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics java PKGNAMESUFFIX= -${OCV_SLAVE} @@ -11,4 +11,6 @@ OCV_JAVA= yes MASTERDIR= ${.CURDIR:H}/opencv PLIST= ${.CURDIR}/pkg-plist +PLIST_SUB+= OCV_VER=${PORTVERSION:S|.||g} + .include "${MASTERDIR}/Makefile" Modified: head/graphics/opencv-java/pkg-plist ============================================================================== --- head/graphics/opencv-java/pkg-plist Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv-java/pkg-plist Tue Sep 2 00:36:27 2014 (r366969) @@ -1,3 +1,3 @@ -%%DATADIR%%/java/libopencv_java247.so -%%DATADIR%%/java/opencv-247.jar +%%DATADIR%%/java/libopencv_java%%OCV_VER%%.so +%%DATADIR%%/java/opencv-%%OCV_VER%%.jar @dirrmtry %%DATADIR%%/java Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv/Makefile Tue Sep 2 00:36:27 2014 (r366969) @@ -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}:BO 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} Modified: head/graphics/opencv/distinfo ============================================================================== --- head/graphics/opencv/distinfo Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv/distinfo Tue Sep 2 00:36:27 2014 (r366969) @@ -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 Modified: head/graphics/opencv/files/patch-modules__core__src__system.cpp ============================================================================== --- head/graphics/opencv/files/patch-modules__core__src__system.cpp Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/opencv/files/patch-modules__core__src__system.cpp Tue Sep 2 00:36:27 2014 (r366969) @@ -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> Modified: head/graphics/py-opencv/Makefile ============================================================================== --- head/graphics/py-opencv/Makefile Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/py-opencv/Makefile Tue Sep 2 00:36:27 2014 (r366969) @@ -1,7 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,4 +12,13 @@ OCV_PYTHON= yes MASTERDIR= ${.CURDIR:H}/opencv PLIST= ${.CURDIR}/pkg-plist +.if defined(PYTHON_REL) && ${PYTHON_REL} >= 320 +PLIST_SUB+= PYTHON3="" \ + PYTHON2="@comment " \ + PYTHON_SUFFIX="${PYTHON_SUFFIX}" +.else +PLIST_SUB+= PYTHON3="@comment " \ + PYTHON2="" +.endif + .include "${MASTERDIR}/Makefile" Modified: head/graphics/py-opencv/pkg-plist ============================================================================== --- head/graphics/py-opencv/pkg-plist Mon Sep 1 23:35:54 2014 (r366968) +++ head/graphics/py-opencv/pkg-plist Tue Sep 2 00:36:27 2014 (r366969) @@ -1,2 +1,7 @@ %%PYTHON_SITELIBDIR%%/cv.py +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cv.pyc +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cv.pyo +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/__pycache__/cv.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/__pycache__/cv.cpython-%%PYTHON_SUFFIX%%.pyo %%PYTHON_SITELIBDIR%%/cv2.so +%%PYTHON3%%@dirrmtry %%PYTHON_SITELIBDIR%%/__pycache__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409020036.s820aRSM067542>