[Midnightbsd-cvs] mports [17048] trunk/graphics: opencv 2.4.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 13 22:16:57 EDT 2014 

Revision: 17048
          http://svnweb.midnightbsd.org/mports/?rev=17048
Author:   laffer1
Date:     2014-09-13 22:16:56 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
opencv 2.4.9

Modified Paths:
--------------
    trunk/graphics/opencv/Makefile
    trunk/graphics/opencv/distinfo
    trunk/graphics/opencv-core/Makefile

Added Paths:
-----------
    trunk/graphics/opencv-core/pkg-plist

Modified: trunk/graphics/opencv/Makefile
===================================================================
--- trunk/graphics/opencv/Makefile	2014-09-14 02:09:43 UTC (rev 17047)
+++ trunk/graphics/opencv/Makefile	2014-09-14 02:16:56 UTC (rev 17048)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME?=	opencv
-PORTVERSION=	2.4.7
+PORTVERSION=	2.4.9
+PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 
@@ -9,9 +10,9 @@
 COMMENT=	Open Source Computer Vision library
 
 LICENSE=	bsd3
-LICENSE_FILE=	${WRKSRC}/doc/license.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig zip
 USE_LDCONFIG=	yes
 WANT_GSTREAMER=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -52,9 +53,6 @@
 .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
@@ -201,19 +199,17 @@
 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
@@ -231,45 +227,52 @@
 	@${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)
-	${MKDIR} ${PREFIX}/share/cmake/Modules
-	${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${PREFIX}/share/cmake/Modules
+	${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)
-	${MKDIR} ${EXAMPLESDIR}
+	(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} . ${EXAMPLESDIR}/python
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python
+.   else
 	cd ${WRKSRC}/samples/python2 && \
-		${COPYTREE_SHARE} . ${EXAMPLESDIR}/python2
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2
+.   endif
 .endif
 .if defined(OCV_JAVA)
-	${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples/java && \
-		${COPYTREE_SHARE} . ${EXAMPLESDIR}/java
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java
 .endif
 
 .include <bsd.port.mk>

Modified: trunk/graphics/opencv/distinfo
===================================================================
--- trunk/graphics/opencv/distinfo	2014-09-14 02:09:43 UTC (rev 17047)
+++ trunk/graphics/opencv/distinfo	2014-09-14 02:16:56 UTC (rev 17048)
@@ -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: trunk/graphics/opencv-core/Makefile
===================================================================
--- trunk/graphics/opencv-core/Makefile	2014-09-14 02:09:43 UTC (rev 17047)
+++ trunk/graphics/opencv-core/Makefile	2014-09-14 02:16:56 UTC (rev 17048)
@@ -1,7 +1,14 @@
 # $MidnightBSD$
-# $FreeBSD: ports/graphics/opencv-core/Makefile,v 1.2 2011/08/22 21:10:22 mm Exp $
-#
-_BUILDING_OPENCV_CORE=	yes
-MASTERDIR=	${.CURDIR}/../opencv
+# $FreeBSD: head/graphics/opencv-core/Makefile 366969 2014-09-02 00:36:27Z jhale $
 
+PORTREVISION=	0
+PKGNAMESUFFIX=	-${OCV_SLAVE}
+
+COMMENT=	OpenCV core libraries
+
+OCV_SLAVE=	core
+OCV_CORE=	yes
+MASTERDIR=	${.CURDIR:H}/opencv
+PLIST=		${.CURDIR}/pkg-plist
+
 .include "${MASTERDIR}/Makefile"

Added: trunk/graphics/opencv-core/pkg-plist
===================================================================
--- trunk/graphics/opencv-core/pkg-plist	                        (rev 0)
+++ trunk/graphics/opencv-core/pkg-plist	2014-09-14 02:16:56 UTC (rev 17048)
@@ -0,0 +1,33 @@
+include/opencv2/core/affine.hpp
+include/opencv2/core/core.hpp
+include/opencv2/core/core_c.h
+include/opencv2/core/cuda_devptrs.hpp
+include/opencv2/core/devmem2d.hpp
+include/opencv2/core/eigen.hpp
+include/opencv2/core/gpumat.hpp
+include/opencv2/core/internal.hpp
+include/opencv2/core/mat.hpp
+include/opencv2/core/opengl_interop.hpp
+include/opencv2/core/opengl_interop_deprecated.hpp
+include/opencv2/core/operations.hpp
+include/opencv2/core/types_c.h
+include/opencv2/core/version.hpp
+include/opencv2/core/wimage.hpp
+include/opencv2/imgproc/imgproc.hpp
+include/opencv2/imgproc/imgproc_c.h
+include/opencv2/imgproc/types_c.h
+ at comment include/opencv2/opencv.hpp
+ at comment include/opencv2/opencv_modules.hpp
+lib/libopencv_core.so
+lib/libopencv_core.so.2
+lib/libopencv_core.so.%%VERSION%%
+lib/libopencv_imgproc.so
+lib/libopencv_imgproc.so.2
+lib/libopencv_imgproc.so.%%VERSION%%
+libdata/pkgconfig/opencv-core.pc
+share/cmake/Modules/FindOpenCVCore.cmake
+ at dirrmtry include/opencv2/core
+ at dirrmtry include/opencv2/imgproc
+ at dirrmtry include/opencv2
+ at dirrmtry share/cmake/Modules
+ at dirrmtry share/cmake

More information about the Midnightbsd-cvs mailing list