[Midnightbsd-cvs] mports [16690] trunk/graphics/opencv: opencv 2.4.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 29 16:14:29 EDT 2014
Revision: 16690
http://svnweb.midnightbsd.org/mports/?rev=16690
Author: laffer1
Date: 2014-08-29 16:14:29 -0400 (Fri, 29 Aug 2014)
Log Message:
-----------
opencv 2.4.7
Modified Paths:
--------------
trunk/graphics/opencv/Makefile
trunk/graphics/opencv/distinfo
trunk/graphics/opencv/pkg-descr
trunk/graphics/opencv/pkg-plist
Removed Paths:
-------------
trunk/graphics/opencv/files/extra-patch-opencv
trunk/graphics/opencv/files/extra-patch-opencv-core
trunk/graphics/opencv/files/extra-patch-opencv-python
trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-any.h
trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-lsh_index.h
trunk/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp
trunk/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp
trunk/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp
trunk/graphics/opencv/files/patch-modules-traincascade-imagestorage.h
trunk/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h
trunk/graphics/opencv/files/patch-samples-cpp-image.cpp
trunk/graphics/opencv/files/patch-samples_cpp_bagofwords_classification.cpp
trunk/graphics/opencv/pkg-plist.oc
trunk/graphics/opencv/pkg-plist.python
Modified: trunk/graphics/opencv/Makefile
===================================================================
--- trunk/graphics/opencv/Makefile 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/Makefile 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,26 +1,21 @@
# $MidnightBSD$
-# $FreeBSD: ports/graphics/opencv/Makefile,v 1.36 2012/01/16 09:46:55 martymac Exp $
PORTNAME?= opencv
-PORTVERSION= 2.3.1
-PORTREVISION= 3
+PORTVERSION= 2.4.7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
-DISTNAME= OpenCV-${DISTVERSION}a
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Open Source Computer Vision library from Intel
+COMMENT= Open Source Computer Vision library
+
LICENSE= bsd3
+LICENSE_FILE= ${WRKSRC}/doc/license.txt
-USES= pkgconfig
+USES= cmake pkgconfig
+USE_LDCONFIG= yes
WANT_GSTREAMER= yes
MAKE_JOBS_UNSAFE= yes
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/OpenCV-${DISTVERSION}
-
NOT_FOR_ARCHS= sparc64
NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64
@@ -27,44 +22,74 @@
DATADIR= ${PREFIX}/share/OpenCV
PLIST_SUB+= VERSION=${DISTVERSION}
-_COMPVERSION!= ${CC} --version
-.if ${_COMPVERSION:Mclang}
-USE_CXXSTD= gnu++11
-CXXFLAGS+= -Wno-error -Wno-c++11-narrowing
-.endif
+CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \
+ -DWITH_PVAPI:BOOL=Off \
+ -DWITH_UNICAP:BOOL=Off \
+ -DBUILD_TESTS:BOOL=Off \
+ -DBUILD_DOCS:BOOL=Off \
+ -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
-.if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-opencv
-LIB_DEPENDS+= opencv_core.2:${PORTSDIR}/graphics/opencv-core
-LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core
+SUB_FILES= FindOpenCVCore.cmake
+SUB_LIST= OCV_VERSION=${PORTVERSION}
-PORTDOCS= *
+OCV_CORE_MODS= core imgproc
+OCV_MODS= calib3d contrib features2d flann gpu \
+ highgui legacy ml ocl objdetect photo \
+ stitching superres ts video videostab
+OCV_NONFREE_MODS= nonfree
+OCV_JAVA_MODS= java
+OCV_PYTHON_MODS= python
-OPTIONS_DEFINE= EIGEN2 FFMPEG GSTREAMER GTK JASPER JPEG OPENEXR PNG \
- QT4 TBB TIFF V4L XINE EXAMPLES
-EIGEN2_DESC= Eigen 2 support
-GTK_DESC= GTK+ support
-OPENEXR_DESC= OpenEXR support
-TBB_DESC= TBB support
+OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL
+OPTIONS_GROUP= IMAGE PERFORMANCE VIDEO
+OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF
+OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB
+OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER V4L XINE
+OPTIONS_RADIO= GUI
+OPTIONS_RADIO_GUI= GTK2 QT4
+OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L
+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
-OPTIONS_DEFAULT= EIGEN2 JASPER JPEG PNG TIFF V4L
+DC1394_DESC= IEEE 1394 camera support
+EIGEN3_DESC= Eigen 3 support
+IMAGE_DESC= Image format support
+NONFREE_DESC= Build functionality that has possible limitations of use
+PERFORMANCE_DESC= Performance enhancing libraries
+TBB_DESC= TBB support
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MEXAMPLES}
-CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
-PORTEXAMPLES+= c cpp gpu
+.if ${PORT_OPTIONS:MDC1394}
+LIB_DEPENDS+= libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+CMAKE_ARGS+= -DWITH_1394:BOOL=On
+.else
+CMAKE_ARGS+= -DWITH_1394:BOOL=Off
.endif
-.if ${PORT_OPTIONS:MEIGEN2}
-BUILD_DEPENDS+= ${LOCALBASE}/include/eigen2/Eigen/Eigen:${PORTSDIR}/math/eigen2
-CMAKE_ARGS+= -DWITH_EIGEN2:BOOL=On
+.if ${PORT_OPTIONS:MEIGEN3}
+BUILD_DEPENDS+= ${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
+CMAKE_ARGS+= -DWITH_EIGEN:BOOL=On
.else
-CMAKE_ARGS+= -DDWITH_EIGEN2:BOOL=Off
+CMAKE_ARGS= -DWITH_EIGEN:BOOL=Off
.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+PORTEXAMPLES= *
+. if !defined(OCV_SLAVE)
+CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=On \
+ -DINSTALL_C_EXAMPLES:BOOL=On
+. endif
+.endif
+
.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=Off
@@ -77,15 +102,18 @@
CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=Off
.endif
-.if ${PORT_OPTIONS:MGTK}
-USE_GNOME= gtk20
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME+= gtk20
CMAKE_ARGS+= -DWITH_GTK:BOOL=On
+. if ${PORT_OPTIONS:MOPENGL}
+LIB_DEPENDS+= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+. endif
.else
CMAKE_ARGS+= -DWITH_GTK:BOOL=Off
.endif
.if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+= libjasper.so:${PORTSDIR}/graphics/jasper
CMAKE_ARGS+= -DWITH_JASPER:BOOL=On
.else
CMAKE_ARGS+= -DWITH_JASPER:BOOL=Off
@@ -92,21 +120,33 @@
.endif
.if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg
CMAKE_ARGS+= -DWITH_JPEG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_JPEG:BOOL=Off
.endif
+.if ${PORT_OPTIONS:MNONFREE}
+CMAKE_ARGS+= -DBUILD_opencv_nonfree:BOOL=On
+.else
+CMAKE_ARGS+= -DBUILD_opencv_nonfree:BOOL=Off
+.endif
+
.if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=On
.else
CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=Off
.endif
+.if ${PORT_OPTIONS:MOPENGL}
+CMAKE_ARGS+= -DWITH_OPENGL:BOOL=On
+.else
+CMAKE_ARGS+= -DWITH_OPENGL:BOOL=Off
+.endif
+
.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png
CMAKE_ARGS+= -DWITH_PNG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_PNG:BOOL=Off
@@ -113,25 +153,25 @@
.endif
.if ${PORT_OPTIONS:MQT4}
-USE_QT4+= opengl moc_build qmake_build rcc_build uic_build qtestlib
-CMAKE_ARGS+= -DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
+USE_QT4+= gui moc_build qmake_build rcc_build uic_build qtestlib
+CMAKE_ARGS+= -DWITH_QT:STRING="4"
+. if ${PORT_OPTIONS:MOPENGL}
+USE_QT4+= opengl
+. endif
.else
CMAKE_ARGS+= -DWITH_QT:BOOL=Off
.endif
.if ${PORT_OPTIONS:MTBB}
-LIB_DEPENDS+= tbb.4:${PORTSDIR}/devel/tbb
+LIB_DEPENDS+= libtbb.so:${PORTSDIR}/devel/tbb
CMAKE_ARGS+= -DWITH_TBB:BOOL=On \
- -DTBBLIB_FOUND:BOOL=1 -DTBB_FOUND:BOOL=On \
- -DTBB_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \
- -DTBB_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" \
- -DTBB_LIBRARIES:STRING="tbb"
+ -DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include"
.else
CMAKE_ARGS+= -DWITH_TBB:BOOL=Off
.endif
.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff
CMAKE_ARGS+= -DWITH_TIFF:BOOL=On
.else
CMAKE_ARGS+= -DWITH_TIFF:BOOL=Off
@@ -138,7 +178,7 @@
.endif
.if ${PORT_OPTIONS:MV4L}
-LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l
+LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
CMAKE_ARGS+= -DWITH_V4L:BOOL=On \
-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
@@ -147,99 +187,89 @@
.endif
.if ${PORT_OPTIONS:MXINE}
-LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+= libxine.so:${PORTSDIR}/multimedia/libxine
CMAKE_ARGS+= -DWITH_XINE:BOOL=On
.else
CMAKE_ARGS+= -DWITH_XINE:BOOL=Off
.endif
-.else # defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
-
-. if defined(_BUILDING_OPENCV_CORE)
-COMMENT= OpenCV core libraries
-PLIST= ${PKGDIR}/pkg-plist.oc
-PKGNAMESUFFIX= -core
-LATEST_LINK= ${PORTNAME}-core
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-opencv-core
-
-. elif defined(_BUILDING_OPENCV_PYTHON)
-COMMENT= OpenCV Python library
-CATEGORIES= graphics python
-PLIST= ${PKGDIR}/pkg-plist.python
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= # no suffix
-
-LIB_DEPENDS+= opencv_legacy.2:${PORTSDIR}/graphics/opencv
+.if defined(OCV_CORE)
+. for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
+. endfor
+.elif defined(OCV_PYTHON)
+LIB_DEPENDS+= libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+BUILD_DEPENDS+= ${PYNUMPY}
+RUN_DEPENDS+= ${PYNUMPY}
+USE_PYTHON= yes
+CFLAGS+= -I${LOCALBASE}/include
+CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On
+. for module in ${OCV_MODS} ${OCV_CORE_MODS} ${OCV_JAVA_MODS}
+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
+. endfor
CMAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
INSTALL_WRKSRC= ${WRKSRC}/modules/python
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-opencv-python
-
-USE_PYTHON= yes
-BUILD_DEPENDS+= ${PYNUMPY}
-RUN_DEPENDS+= ${PYNUMPY}
-. endif # defined(_BUILDING_OPENCV_PYTHON)
-CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=Off \
- -DINSTALL_PYTHON_EXAMPLES:BOOL=Off \
- -DBUILD_TESTS:BOOL=Off \
- -DDWITH_EIGEN2:BOOL=Off \
- -DWITH_FFMPEG:BOOL=Off \
- -DWITH_GSTREAMER:BOOL=Off \
- -DWITH_GTK:BOOL=Off \
- -DWITH_JASPER:BOOL=Off \
- -DWITH_JPEG:BOOL=Off \
- -DWITH_OPENEXR:BOOL=Off \
- -DWITH_PNG:BOOL=Off \
- -DWITH_QT:BOOL=Off \
- -DWITH_TBB:BOOL=Off \
- -DWITH_V4L:BOOL=Off \
- -DWITH_TIFF:BOOL=Off \
- -DWITH_XINE:BOOL=Off \
- -DWITH_PVAPI:BOOL=Off \
- -DWITH_1394:BOOL=Off \
- -DWITH_CUDA:BOOL=Off
-.endif # defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
-
-.if defined(_BUILDING_OPENCV_PYTHON)
-CMAGE_ARGS+= -DBUILD_NEW_PYTHON_SUPPORT:BOOL=On
+.elif defined(OCV_JAVA)
+BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
+LIB_DEPENDS+= libopencv_legacy.so:${PORTSDIR}/graphics/opencv
+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
+. endfor
+CMAKE_ENV+= JAVA_HOME="${JAVA_HOME}"
+INSTALL_WRKSRC= ${WRKSRC}/modules/java
.else
-CMAGE_ARGS+= -DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off
+LIB_DEPENDS+= libopencv_core.so:${PORTSDIR}/graphics/opencv-core
+. for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
+. endfor
.endif
-.include <bsd.port.pre.mk>
-
post-patch:
@${MKDIR} ${CONFIGURE_WRKSRC}
- @${REINPLACE_CMD} -e 's:set(OPENCV_SOVERSION.*:set(OPENCV_SOVERSION "$${OPENCV_VERSION_MAJOR}"):' \
- -e 's:-pthread:${PTHREAD_LIBS}:g' \
- -e 's:$${OPENCV_LIB_INSTALL_PATH}/pkgconfig:$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig:g' \
- -e 's:share/OpenCV/doc:share/doc/opencv:g' \
+ @${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' \
${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e 's|${PORTNAME}/samples|examples/${PORTNAME}|g' \
+ @${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 {} \;
+ @${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
+.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
+.endif
-.if defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
- @${REINPLACE_CMD} -e '/add_subdirectory(data)/ d' \
- -e '/add_subdirectory(include)/ d' \
- -e 's|opencv.pc|opencv-core.pc|g' \
- -e 's|OpenCVConfig.cmake|OpenCVConfig-core.cmake|g' \
- -e 's|OpenCVConfig-version.cmake|OpenCVConfig-core-version.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 \
- 's|Libs:.*|Libs: -L$${libdir} -lopencv_core at OPENCV_DLLVERSION@ -lopencv_imgproc at OPENCV_DLLVERSION@ -lopencv_video at OPENCV_DLLVERSION@ -lopencv_flann at OPENCV_DLLVERSION@|' \
- ${WRKSRC}/opencv.pc.cmake.in > ${WRKSRC}/opencv-core.pc.cmake.in
- @${SED} -E -e \
- 's| set\(OPENCV_LIB_COMPONENTS .*| set\(OPENCV_LIB_COMPONENTS opencv_core opencv_imgproc opencv_video opencv_ml opencv_flann\)|g' \
- ${WRKSRC}/OpenCVConfig.cmake.in > ${WRKSRC}/OpenCVConfig-core.cmake.in
- @${LN} -sf OpenCVConfig-version.cmake.in ${WRKSRC}/OpenCVConfig-core-version.cmake.in
+post-install:
+.if defined(OCV_CORE)
+ ${MKDIR} ${PREFIX}/share/cmake/Modules
+ ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${PREFIX}/share/cmake/Modules
.endif
-.if ! ${PORT_OPTIONS:MDOCS} || defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
- @${REINPLACE_CMD} -e '/add_subdirectory(doc)/ d' \
- ${WRKSRC}/CMakeLists.txt
+.if defined(OCV_PYTHON)
+ ${MKDIR} ${EXAMPLESDIR}
+ cd ${WRKSRC}/samples/python && \
+ ${COPYTREE_SHARE} . ${EXAMPLESDIR}/python
+ cd ${WRKSRC}/samples/python2 && \
+ ${COPYTREE_SHARE} . ${EXAMPLESDIR}/python2
.endif
+.if defined(OCV_JAVA)
+ ${MKDIR} ${EXAMPLESDIR}
+ cd ${WRKSRC}/samples/java && \
+ ${COPYTREE_SHARE} . ${EXAMPLESDIR}/java
+.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/graphics/opencv/distinfo
===================================================================
--- trunk/graphics/opencv/distinfo 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/distinfo 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,2 +1,2 @@
-SHA256 (OpenCV-2.3.1a.tar.bz2) = a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
-SIZE (OpenCV-2.3.1a.tar.bz2) = 32669613
+SHA256 (opencv-2.4.7.tar.gz) = c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43
+SIZE (opencv-2.4.7.tar.gz) = 85587316
Deleted: trunk/graphics/opencv/files/extra-patch-opencv
===================================================================
--- trunk/graphics/opencv/files/extra-patch-opencv 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/extra-patch-opencv 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,37 +0,0 @@
---- modules/CMakeLists.txt.orig 2011-08-02 14:48:41.000000000 +0200
-+++ modules/CMakeLists.txt 2011-08-22 13:17:48.167347755 +0200
-@@ -10,18 +10,18 @@
- endif()
-
- add_subdirectory(calib3d)
--add_subdirectory(core)
-+#add_subdirectory(core)
- add_subdirectory(features2d)
--add_subdirectory(flann)
-+#add_subdirectory(flann)
-
--if(BUILD_TESTS)
-- add_subdirectory(ts)
--endif()
-+#if(BUILD_TESTS)
-+# add_subdirectory(ts)
-+#endif()
- add_subdirectory(highgui)
--add_subdirectory(imgproc)
-+#add_subdirectory(imgproc)
- add_subdirectory(legacy)
- add_subdirectory(contrib)
--add_subdirectory(ml)
-+#add_subdirectory(ml)
- add_subdirectory(objdetect)
-
- if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
-@@ -32,7 +32,7 @@
- add_subdirectory(java)
- endif()
-
--add_subdirectory(video)
-+#add_subdirectory(video)
- add_subdirectory(traincascade)
- add_subdirectory(haartraining)
-
Deleted: trunk/graphics/opencv/files/extra-patch-opencv-core
===================================================================
--- trunk/graphics/opencv/files/extra-patch-opencv-core 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/extra-patch-opencv-core 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,58 +0,0 @@
---- modules/CMakeLists.txt.orig 2011-08-02 14:48:41.000000000 +0200
-+++ modules/CMakeLists.txt 2011-08-22 12:12:01.825347584 +0200
-@@ -9,34 +9,34 @@
- endif()
- endif()
-
--add_subdirectory(calib3d)
-+#add_subdirectory(calib3d)
- add_subdirectory(core)
--add_subdirectory(features2d)
-+#add_subdirectory(features2d)
- add_subdirectory(flann)
-
--if(BUILD_TESTS)
-+#if(BUILD_TESTS)
- add_subdirectory(ts)
--endif()
--add_subdirectory(highgui)
-+#endif()
-+#add_subdirectory(highgui)
- add_subdirectory(imgproc)
--add_subdirectory(legacy)
--add_subdirectory(contrib)
-+#add_subdirectory(legacy)
-+#add_subdirectory(contrib)
- add_subdirectory(ml)
--add_subdirectory(objdetect)
-+#add_subdirectory(objdetect)
-
--if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
-- add_subdirectory(python)
--endif()
--
--if(BUILD_JAVA_SUPPORT)
-- add_subdirectory(java)
--endif()
-+#if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
-+# add_subdirectory(python)
-+#endif()
-+
-+#if(BUILD_JAVA_SUPPORT)
-+# add_subdirectory(java)
-+#endif()
-
- add_subdirectory(video)
--add_subdirectory(traincascade)
--add_subdirectory(haartraining)
-+#add_subdirectory(traincascade)
-+#add_subdirectory(haartraining)
-
--if(NOT ANDROID)
-- add_subdirectory(gpu)
-- add_subdirectory(stitching)
--endif()
-+#if(NOT ANDROID)
-+# add_subdirectory(gpu)
-+# add_subdirectory(stitching)
-+#endif()
Deleted: trunk/graphics/opencv/files/extra-patch-opencv-python
===================================================================
--- trunk/graphics/opencv/files/extra-patch-opencv-python 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/extra-patch-opencv-python 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,45 +0,0 @@
---- modules/CMakeLists.txt.orig 2011-08-22 18:34:10.458995645 +0200
-+++ modules/CMakeLists.txt 2011-08-22 18:34:30.560542908 +0200
-@@ -1,42 +1,3 @@
--if(ANDROID)
-- ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0)
-- if(ANDROID_API_LEVEL LESS 8)
-- ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
-- endif()
--
-- IF(WITH_ANDROID_CAMERA)
-- add_subdirectory(androidcamera)
-- endif()
--endif()
--
--add_subdirectory(calib3d)
--add_subdirectory(core)
--add_subdirectory(features2d)
--add_subdirectory(flann)
--
--if(BUILD_TESTS)
-- add_subdirectory(ts)
--endif()
--add_subdirectory(highgui)
--add_subdirectory(imgproc)
--add_subdirectory(legacy)
--add_subdirectory(contrib)
--add_subdirectory(ml)
--add_subdirectory(objdetect)
--
- if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
- add_subdirectory(python)
- endif()
--
--if(BUILD_JAVA_SUPPORT)
-- add_subdirectory(java)
--endif()
--
--add_subdirectory(video)
--add_subdirectory(traincascade)
--add_subdirectory(haartraining)
--
--if(NOT ANDROID)
-- add_subdirectory(gpu)
-- add_subdirectory(stitching)
--endif()
Deleted: trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-any.h
===================================================================
--- trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-any.h 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-any.h 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,17 +0,0 @@
-Index: modules/flann/include/opencv2/flann/any.h
-===================================================================
---- modules/flann/include/opencv2/flann/any.h (revision 6880)
-+++ modules/flann/include/opencv2/flann/any.h (revision 6881)
-@@ -30,6 +30,12 @@
- {
- };
-
-+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
-+{
-+ out << "[empty_any]";
-+ return out;
-+}
-+
- struct base_any_policy
- {
- virtual void static_delete(void** x) = 0;
Deleted: trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-lsh_index.h
===================================================================
--- trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-lsh_index.h 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-flann-include-opencv2-flann-lsh_index.h 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,13 +0,0 @@
-Index: modules/flann/include/opencv2/flann/lsh_index.h
-===================================================================
---- modules/flann/include/opencv2/flann/lsh_index.h (revision 6880)
-+++ modules/flann/include/opencv2/flann/lsh_index.h (revision 6881)
-@@ -56,7 +56,7 @@
-
- struct LshIndexParams : public IndexParams
- {
-- LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
-+ LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
- {
- (* this)["algorithm"] = FLANN_INDEX_LSH;
- // The number of hash tables to use
Deleted: trunk/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp
===================================================================
--- trunk/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg_impl.hpp 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,12 +0,0 @@
---- 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
--#undef _STDINT_H
-+#undef _SYS_STDINT_H_
-+#undef _MACHINE__STDINT_H_
- #include <stdint.h>
- #endif
- #include <errno.h>
Deleted: trunk/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp
===================================================================
--- trunk/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,19 +0,0 @@
---- modules/highgui/src/cap_libv4l.cpp.orig 2011-06-21 15:24:06.000000000 +0200
-+++ modules/highgui/src/cap_libv4l.cpp 2011-06-27 08:39:17.750223439 +0200
-@@ -236,7 +236,6 @@
- #include <sys/mman.h>
- #include <string.h>
- #include <stdlib.h>
--#include <asm/types.h> /* for videodev2.h */
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-@@ -568,7 +567,7 @@
-
- static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
-
-- __u32 ctrl_id;
-+ uint32_t ctrl_id;
- struct v4l2_control c;
- if (capture->v4l2_ctrl_ranges != NULL) {
- v4l2_free_ranges(capture);
Deleted: trunk/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp
===================================================================
--- trunk/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,20 +0,0 @@
---- modules/highgui/src/cap_v4l.cpp.orig 2011-06-21 15:24:06.000000000 +0200
-+++ modules/highgui/src/cap_v4l.cpp 2011-06-27 08:38:16.221682985 +0200
-@@ -218,7 +218,6 @@
-
- #include <string.h>
- #include <stdlib.h>
--#include <asm/types.h> /* for videodev2.h */
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-@@ -649,8 +648,7 @@
-
- static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
- {
--
-- __u32 ctrl_id;
-+ uint32_t ctrl_id;
-
- for (ctrl_id = V4L2_CID_BASE;
- ctrl_id < V4L2_CID_LASTP1;
Deleted: trunk/graphics/opencv/files/patch-modules-traincascade-imagestorage.h
===================================================================
--- trunk/graphics/opencv/files/patch-modules-traincascade-imagestorage.h 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules-traincascade-imagestorage.h 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,10 +0,0 @@
---- modules/traincascade/imagestorage.h.orig 2011-06-27 08:30:19.212006174 +0200
-+++ modules/traincascade/imagestorage.h 2011-06-27 08:30:50.325671316 +0200
-@@ -1,6 +1,7 @@
- #ifndef _OPENCV_IMAGESTORAGE_H_
- #define _OPENCV_IMAGESTORAGE_H_
-
-+#include <cstdio>
- #include "highgui.h"
-
- using namespace cv;
Deleted: trunk/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h
===================================================================
--- trunk/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,268 +0,0 @@
---- ./modules/ts/include/opencv2/ts/ts_gtest.h.orig 2013-09-01 01:03:57.000000000 +0100
-+++ ./modules/ts/include/opencv2/ts/ts_gtest.h 2013-09-01 01:03:38.000000000 +0100
-@@ -53,6 +53,7 @@
-
- #include <limits>
- #include <vector>
-+#include <unistd.h>
-
- // Copyright 2005, Google Inc.
- // All rights reserved.
-@@ -543,7 +544,7 @@
- // Author: wan at google.com (Zhanyong Wan)
-
- // Implements a subset of TR1 tuple needed by Google Test and Google Mock.
--
-+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ 1
- #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
- #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
-
-@@ -1504,11 +1505,31 @@
- // <tr1/functional>. Hence the following #define is a hack to prevent
- // <tr1/functional> from being included.
- #define _TR1_FUNCTIONAL 1
-+#if __has_include(<tuple>)
-+#include <tuple>
-+namespace gtest {
-+ using ::std::tuple;
-+}
-+#else
- #include <tr1/tuple>
-+namespace gtest {
-+ using ::std::tr1::tuple;
-+}
-+#endif
- #undef _TR1_FUNCTIONAL // Allows the user to #include
- // <tr1/functional> if he chooses to.
- #else
--#include <tr1/tuple> // NOLINT
-+#if __has_include(<tuple>)
-+#include <tuple>
-+namespace gtest {
-+ using ::std::tuple;
-+}
-+#else
-+#include <tr1/tuple>
-+namespace gtest {
-+ using ::std::tr1::tuple;
-+}
-+#endif
- #endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
-
- #else
-@@ -11951,9 +11972,9 @@
- //
- template <typename T1, typename T2>
- class CartesianProductGenerator2
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2> > {
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2> ParamType;
-+ typedef gtest::tuple<T1, T2> ParamType;
-
- CartesianProductGenerator2(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2)
-@@ -12066,9 +12087,9 @@
-
- template <typename T1, typename T2, typename T3>
- class CartesianProductGenerator3
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3> > {
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3> ParamType;
-+ typedef gtest::tuple<T1, T2, T3> ParamType;
-
- CartesianProductGenerator3(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3)
-@@ -12198,9 +12219,9 @@
-
- template <typename T1, typename T2, typename T3, typename T4>
- class CartesianProductGenerator4
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4> > {
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4> ParamType;
-
- CartesianProductGenerator4(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -12349,9 +12370,9 @@
-
- template <typename T1, typename T2, typename T3, typename T4, typename T5>
- class CartesianProductGenerator5
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5> > {
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5> ParamType;
-
- CartesianProductGenerator5(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -12517,10 +12538,10 @@
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6>
- class CartesianProductGenerator6
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5,
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5,
- T6> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5, T6> ParamType;
-
- CartesianProductGenerator6(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -12703,10 +12724,10 @@
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7>
- class CartesianProductGenerator7
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5, T6,
- T7> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
-
- CartesianProductGenerator7(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -12906,10 +12927,10 @@
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8>
- class CartesianProductGenerator8
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5, T6,
- T7, T8> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
-
- CartesianProductGenerator8(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -13128,10 +13149,10 @@
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9>
- class CartesianProductGenerator9
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5, T6,
- T7, T8, T9> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
-
- CartesianProductGenerator9(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -13367,10 +13388,10 @@
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
- class CartesianProductGenerator10
-- : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
-+ : public ParamGeneratorInterface< gtest::tuple<T1, T2, T3, T4, T5, T6,
- T7, T8, T9, T10> > {
- public:
-- typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
-+ typedef gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
-
- CartesianProductGenerator10(const ParamGenerator<T1>& g1,
- const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
-@@ -13632,8 +13653,8 @@
- CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
- : g1_(g1), g2_(g2) {}
- template <typename T1, typename T2>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2> >(
-+ operator ParamGenerator< gtest::tuple<T1, T2> >() const {
-+ return ParamGenerator< gtest::tuple<T1, T2> >(
- new CartesianProductGenerator2<T1, T2>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_)));
-@@ -13654,8 +13675,8 @@
- const Generator3& g3)
- : g1_(g1), g2_(g2), g3_(g3) {}
- template <typename T1, typename T2, typename T3>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3> >(
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3> >() const {
-+ return ParamGenerator< gtest::tuple<T1, T2, T3> >(
- new CartesianProductGenerator3<T1, T2, T3>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13679,8 +13700,8 @@
- const Generator3& g3, const Generator4& g4)
- : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
- template <typename T1, typename T2, typename T3, typename T4>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4> >(
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4> >() const {
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4> >(
- new CartesianProductGenerator4<T1, T2, T3, T4>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13706,8 +13727,8 @@
- const Generator3& g3, const Generator4& g4, const Generator5& g5)
- : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5> >(
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5> >() const {
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5> >(
- new CartesianProductGenerator5<T1, T2, T3, T4, T5>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13737,8 +13758,8 @@
- : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> >(
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6> >() const {
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6> >(
- new CartesianProductGenerator6<T1, T2, T3, T4, T5, T6>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13770,9 +13791,9 @@
- : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6,
- T7> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7> >(
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7> >(
- new CartesianProductGenerator7<T1, T2, T3, T4, T5, T6, T7>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13808,9 +13829,9 @@
- g8_(g8) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7,
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7,
- T8> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
- new CartesianProductGenerator8<T1, T2, T3, T4, T5, T6, T7, T8>(
- static_cast<ParamGenerator<T1> >(g1_),
- static_cast<ParamGenerator<T2> >(g2_),
-@@ -13849,9 +13870,9 @@
- g9_(g9) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
- T9> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
- T9> >(
- new CartesianProductGenerator9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
- static_cast<ParamGenerator<T1> >(g1_),
-@@ -13893,9 +13914,9 @@
- g9_(g9), g10_(g10) {}
- template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-- operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
-+ operator ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
- T9, T10> >() const {
-- return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
-+ return ParamGenerator< gtest::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
- T9, T10> >(
- new CartesianProductGenerator10<T1, T2, T3, T4, T5, T6, T7, T8, T9,
- T10>(
Deleted: trunk/graphics/opencv/files/patch-samples-cpp-image.cpp
===================================================================
--- trunk/graphics/opencv/files/patch-samples-cpp-image.cpp 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-samples-cpp-image.cpp 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,7 +0,0 @@
---- samples/cpp/image.cpp.orig 2011-06-21 15:24:12.000000000 +0200
-+++ samples/cpp/image.cpp 2011-06-27 08:32:11.174032625 +0200
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include "cv.h" // include standard OpenCV headers, same as before
- #include "highgui.h"
- #include "ml.h"
Deleted: trunk/graphics/opencv/files/patch-samples_cpp_bagofwords_classification.cpp
===================================================================
--- trunk/graphics/opencv/files/patch-samples_cpp_bagofwords_classification.cpp 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/files/patch-samples_cpp_bagofwords_classification.cpp 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,11 +0,0 @@
---- samples/cpp/bagofwords_classification.cpp.orig 2011-09-12 20:20:43.000000000 +0200
-+++ samples/cpp/bagofwords_classification.cpp 2013-09-12 14:57:38.068066669 +0200
-@@ -1814,7 +1814,7 @@
- void VocData::readFileToString(const string filename, string& file_contents)
- {
- std::ifstream ifs(filename.c_str());
-- if (ifs == false) CV_Error(CV_StsError,"could not open text file");
-+ if (!ifs.is_open()) CV_Error(CV_StsError,"could not open text file");
-
- stringstream oss;
- oss << ifs.rdbuf();
Modified: trunk/graphics/opencv/pkg-descr
===================================================================
--- trunk/graphics/opencv/pkg-descr 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/pkg-descr 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,6 +1,20 @@
-The Open Computer Vision Library is a collection of algorithms and sample
-code for various computer vision problems. The library is compatible with
-IPL and utilizes Intel Integrated Performance Primitives for better
-performance.
+OpenCV (Open Source Computer Vision Library) is an open source
+computer vision and machine learning software library. OpenCV was
+built to provide a common infrastructure for computer vision
+applications and to accelerate the use of machine perception in the
+commercial products. Being a BSD-licensed product, OpenCV makes it
+easy for businesses to utilize and modify the code.
+The library has more than 2500 optimized algorithms, which includes
+a comprehensive set of both classic and state-of-the-art computer
+vision and machine learning algorithms. These algorithms can be
+used to detect and recognize faces, identify objects, classify human
+actions in videos, track camera movements, track moving objects,
+extract 3D models of objects, produce 3D point clouds from stereo
+cameras, stitch images together to produce a high resolution image
+of an entire scene, find similar images from an image database,
+remove red eyes from images taken using flash, follow eye movements,
+recognize scenery and establish markers to overlay it with augmented
+reality, etc.
+
WWW: http://www.opencv.org
Modified: trunk/graphics/opencv/pkg-plist
===================================================================
--- trunk/graphics/opencv/pkg-plist 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/pkg-plist 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,7 +1,6 @@
bin/opencv_createsamples
bin/opencv_haartraining
bin/opencv_performance
-bin/opencv_stitching
bin/opencv_traincascade
include/opencv/cv.h
include/opencv/cv.hpp
@@ -16,23 +15,136 @@
include/opencv/ml.h
include/opencv2/calib3d/calib3d.hpp
include/opencv2/contrib/contrib.hpp
+include/opencv2/contrib/detection_based_tracker.hpp
+include/opencv2/contrib/hybridtracker.hpp
+include/opencv2/contrib/openfabmap.hpp
include/opencv2/contrib/retina.hpp
include/opencv2/features2d/features2d.hpp
-include/opencv2/gpu/NCV.hpp
-include/opencv2/gpu/NPP_staging.hpp
+include/opencv2/flann/all_indices.h
+include/opencv2/flann/allocator.h
+include/opencv2/flann/any.h
+include/opencv2/flann/autotuned_index.h
+include/opencv2/flann/composite_index.h
+include/opencv2/flann/config.h
+include/opencv2/flann/defines.h
+include/opencv2/flann/dist.h
+include/opencv2/flann/dummy.h
+include/opencv2/flann/dynamic_bitset.h
+include/opencv2/flann/flann.hpp
+include/opencv2/flann/flann_base.hpp
+include/opencv2/flann/general.h
+include/opencv2/flann/ground_truth.h
+include/opencv2/flann/hdf5.h
+include/opencv2/flann/heap.h
+include/opencv2/flann/hierarchical_clustering_index.h
+include/opencv2/flann/index_testing.h
+include/opencv2/flann/kdtree_index.h
+include/opencv2/flann/kdtree_single_index.h
+include/opencv2/flann/kmeans_index.h
+include/opencv2/flann/linear_index.h
+include/opencv2/flann/logger.h
+include/opencv2/flann/lsh_index.h
+include/opencv2/flann/lsh_table.h
+include/opencv2/flann/matrix.h
+include/opencv2/flann/miniflann.hpp
+include/opencv2/flann/nn_index.h
+include/opencv2/flann/object_factory.h
+include/opencv2/flann/params.h
+include/opencv2/flann/random.h
+include/opencv2/flann/result_set.h
+include/opencv2/flann/sampling.h
+include/opencv2/flann/saving.h
+include/opencv2/flann/simplex_downhill.h
+include/opencv2/flann/timer.h
+include/opencv2/gpu/device/block.hpp
+include/opencv2/gpu/device/border_interpolate.hpp
+include/opencv2/gpu/device/color.hpp
+include/opencv2/gpu/device/common.hpp
+include/opencv2/gpu/device/datamov_utils.hpp
+include/opencv2/gpu/device/detail/color_detail.hpp
+include/opencv2/gpu/device/detail/reduce.hpp
+include/opencv2/gpu/device/detail/reduce_key_val.hpp
+include/opencv2/gpu/device/detail/transform_detail.hpp
+include/opencv2/gpu/device/detail/type_traits_detail.hpp
+include/opencv2/gpu/device/detail/vec_distance_detail.hpp
+include/opencv2/gpu/device/dynamic_smem.hpp
+include/opencv2/gpu/device/emulation.hpp
+include/opencv2/gpu/device/filters.hpp
+include/opencv2/gpu/device/funcattrib.hpp
+include/opencv2/gpu/device/functional.hpp
+include/opencv2/gpu/device/limits.hpp
+include/opencv2/gpu/device/reduce.hpp
+include/opencv2/gpu/device/saturate_cast.hpp
+include/opencv2/gpu/device/scan.hpp
+include/opencv2/gpu/device/simd_functions.hpp
+include/opencv2/gpu/device/static_check.hpp
+include/opencv2/gpu/device/transform.hpp
+include/opencv2/gpu/device/type_traits.hpp
+include/opencv2/gpu/device/utility.hpp
+include/opencv2/gpu/device/vec_distance.hpp
+include/opencv2/gpu/device/vec_math.hpp
+include/opencv2/gpu/device/vec_traits.hpp
+include/opencv2/gpu/device/warp.hpp
+include/opencv2/gpu/device/warp_reduce.hpp
+include/opencv2/gpu/device/warp_shuffle.hpp
include/opencv2/gpu/devmem2d.hpp
include/opencv2/gpu/gpu.hpp
include/opencv2/gpu/gpumat.hpp
-include/opencv2/gpu/matrix_operations.hpp
include/opencv2/gpu/stream_accessor.hpp
+include/opencv2/highgui/cap_ios.h
include/opencv2/highgui/highgui.hpp
include/opencv2/highgui/highgui_c.h
+include/opencv2/highgui/ios.h
include/opencv2/legacy/blobtrack.hpp
include/opencv2/legacy/compat.hpp
include/opencv2/legacy/legacy.hpp
include/opencv2/legacy/streams.hpp
+include/opencv2/ml/ml.hpp
+%%NONFREE%%include/opencv2/nonfree/features2d.hpp
+%%NONFREE%%include/opencv2/nonfree/gpu.hpp
+%%NONFREE%%include/opencv2/nonfree/nonfree.hpp
+%%NONFREE%%include/opencv2/nonfree/ocl.hpp
include/opencv2/objdetect/objdetect.hpp
+include/opencv2/ocl/matrix_operations.hpp
+include/opencv2/ocl/ocl.hpp
include/opencv2/opencv.hpp
+include/opencv2/opencv_modules.hpp
+include/opencv2/photo/photo.hpp
+include/opencv2/photo/photo_c.h
+include/opencv2/stitching/detail/autocalib.hpp
+include/opencv2/stitching/detail/blenders.hpp
+include/opencv2/stitching/detail/camera.hpp
+include/opencv2/stitching/detail/exposure_compensate.hpp
+include/opencv2/stitching/detail/matchers.hpp
+include/opencv2/stitching/detail/motion_estimators.hpp
+include/opencv2/stitching/detail/seam_finders.hpp
+include/opencv2/stitching/detail/util.hpp
+include/opencv2/stitching/detail/util_inl.hpp
+include/opencv2/stitching/detail/warpers.hpp
+include/opencv2/stitching/detail/warpers_inl.hpp
+include/opencv2/stitching/stitcher.hpp
+include/opencv2/stitching/warpers.hpp
+include/opencv2/superres/optical_flow.hpp
+include/opencv2/superres/superres.hpp
+include/opencv2/ts/gpu_perf.hpp
+include/opencv2/ts/gpu_test.hpp
+include/opencv2/ts/ts.hpp
+include/opencv2/ts/ts_gtest.h
+include/opencv2/ts/ts_perf.hpp
+include/opencv2/video/background_segm.hpp
+include/opencv2/video/tracking.hpp
+include/opencv2/video/video.hpp
+include/opencv2/videostab/deblurring.hpp
+include/opencv2/videostab/fast_marching.hpp
+include/opencv2/videostab/fast_marching_inl.hpp
+include/opencv2/videostab/frame_source.hpp
+include/opencv2/videostab/global_motion.hpp
+include/opencv2/videostab/inpainting.hpp
+include/opencv2/videostab/log.hpp
+include/opencv2/videostab/motion_stabilizing.hpp
+include/opencv2/videostab/optical_flow.hpp
+include/opencv2/videostab/stabilizer.hpp
+include/opencv2/videostab/videostab.hpp
lib/libopencv_calib3d.so
lib/libopencv_calib3d.so.2
lib/libopencv_calib3d.so.%%VERSION%%
@@ -42,6 +154,9 @@
lib/libopencv_features2d.so
lib/libopencv_features2d.so.2
lib/libopencv_features2d.so.%%VERSION%%
+lib/libopencv_flann.so
+lib/libopencv_flann.so.2
+lib/libopencv_flann.so.%%VERSION%%
lib/libopencv_gpu.so
lib/libopencv_gpu.so.2
lib/libopencv_gpu.so.%%VERSION%%
@@ -51,12 +166,39 @@
lib/libopencv_legacy.so
lib/libopencv_legacy.so.2
lib/libopencv_legacy.so.%%VERSION%%
+lib/libopencv_ml.so
+lib/libopencv_ml.so.2
+lib/libopencv_ml.so.%%VERSION%%
+%%NONFREE%%lib/libopencv_nonfree.so
+%%NONFREE%%lib/libopencv_nonfree.so.2
+%%NONFREE%%lib/libopencv_nonfree.so.%%VERSION%%
lib/libopencv_objdetect.so
lib/libopencv_objdetect.so.2
lib/libopencv_objdetect.so.%%VERSION%%
+lib/libopencv_ocl.so
+lib/libopencv_ocl.so.2
+lib/libopencv_ocl.so.%%VERSION%%
+lib/libopencv_photo.so
+lib/libopencv_photo.so.2
+lib/libopencv_photo.so.%%VERSION%%
+lib/libopencv_stitching.so
+lib/libopencv_stitching.so.2
+lib/libopencv_stitching.so.%%VERSION%%
+lib/libopencv_superres.so
+lib/libopencv_superres.so.2
+lib/libopencv_superres.so.%%VERSION%%
+lib/libopencv_ts.a
+lib/libopencv_video.so
+lib/libopencv_video.so.2
+lib/libopencv_video.so.%%VERSION%%
+lib/libopencv_videostab.so
+lib/libopencv_videostab.so.2
+lib/libopencv_videostab.so.%%VERSION%%
libdata/pkgconfig/opencv.pc
+%%DATADIR%%/OpenCVConfig-version.cmake
%%DATADIR%%/OpenCVConfig.cmake
-%%DATADIR%%/OpenCVConfig-version.cmake
+%%DATADIR%%/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/OpenCVModules.cmake
%%DATADIR%%/haarcascades/haarcascade_eye.xml
%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
@@ -77,14 +219,31 @@
%%DATADIR%%/haarcascades/haarcascade_mcs_upperbody.xml
%%DATADIR%%/haarcascades/haarcascade_profileface.xml
%%DATADIR%%/haarcascades/haarcascade_righteye_2splits.xml
+%%DATADIR%%/haarcascades/haarcascade_smile.xml
%%DATADIR%%/haarcascades/haarcascade_upperbody.xml
%%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml
+%%DATADIR%%/lbpcascades/lbpcascade_profileface.xml
+%%DATADIR%%/lbpcascades/lbpcascade_silverware.xml
@dirrm %%DATADIR%%/lbpcascades
@dirrm %%DATADIR%%/haarcascades
+ at dirrmtry %%DATADIR%%
+ at dirrm include/opencv2/videostab
+ at dirrm include/opencv2/video
+ at dirrm include/opencv2/ts
+ at dirrm include/opencv2/superres
+ at dirrm include/opencv2/stitching/detail
+ at dirrm include/opencv2/stitching
+ at dirrm include/opencv2/photo
+ at dirrm include/opencv2/ocl
@dirrm include/opencv2/objdetect
+%%NONFREE%%@dirrm include/opencv2/nonfree
+ at dirrm include/opencv2/ml
@dirrm include/opencv2/legacy
@dirrm include/opencv2/highgui
+ at dirrm include/opencv2/gpu/device/detail
+ at dirrm include/opencv2/gpu/device
@dirrm include/opencv2/gpu
+ at dirrm include/opencv2/flann
@dirrm include/opencv2/features2d
@dirrm include/opencv2/contrib
@dirrm include/opencv2/calib3d
Deleted: trunk/graphics/opencv/pkg-plist.oc
===================================================================
--- trunk/graphics/opencv/pkg-plist.oc 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/pkg-plist.oc 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,83 +0,0 @@
-include/opencv2/core/core.hpp
-include/opencv2/core/core_c.h
-include/opencv2/core/eigen.hpp
-include/opencv2/core/internal.hpp
-include/opencv2/core/mat.hpp
-include/opencv2/core/operations.hpp
-include/opencv2/core/types_c.h
-include/opencv2/core/version.hpp
-include/opencv2/core/wimage.hpp
-include/opencv2/flann/all_indices.h
-include/opencv2/flann/allocator.h
-include/opencv2/flann/any.h
-include/opencv2/flann/autotuned_index.h
-include/opencv2/flann/composite_index.h
-include/opencv2/flann/config.h
-include/opencv2/flann/defines.h
-include/opencv2/flann/dist.h
-include/opencv2/flann/dummy.h
-include/opencv2/flann/dynamic_bitset.h
-include/opencv2/flann/flann.hpp
-include/opencv2/flann/flann_base.hpp
-include/opencv2/flann/general.h
-include/opencv2/flann/ground_truth.h
-include/opencv2/flann/hdf5.h
-include/opencv2/flann/heap.h
-include/opencv2/flann/hierarchical_clustering_index.h
-include/opencv2/flann/index_testing.h
-include/opencv2/flann/kdtree_index.h
-include/opencv2/flann/kdtree_single_index.h
-include/opencv2/flann/kmeans_index.h
-include/opencv2/flann/linear_index.h
-include/opencv2/flann/logger.h
-include/opencv2/flann/lsh_index.h
-include/opencv2/flann/lsh_table.h
-include/opencv2/flann/matrix.h
-include/opencv2/flann/miniflann.hpp
-include/opencv2/flann/nn_index.h
-include/opencv2/flann/object_factory.h
-include/opencv2/flann/params.h
-include/opencv2/flann/random.h
-include/opencv2/flann/result_set.h
-include/opencv2/flann/sampling.h
-include/opencv2/flann/saving.h
-include/opencv2/flann/simplex_downhill.h
-include/opencv2/flann/timer.h
-include/opencv2/imgproc/imgproc.hpp
-include/opencv2/imgproc/imgproc_c.h
-include/opencv2/imgproc/types_c.h
-include/opencv2/ml/ml.hpp
-include/opencv2/ts/ts.hpp
-include/opencv2/ts/ts_gtest.h
-include/opencv2/video/background_segm.hpp
-include/opencv2/video/tracking.hpp
-include/opencv2/video/video.hpp
-lib/libopencv_core.so
-lib/libopencv_core.so.2
-lib/libopencv_core.so.%%VERSION%%
-lib/libopencv_flann.so
-lib/libopencv_flann.so.2
-lib/libopencv_flann.so.%%VERSION%%
-lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.2
-lib/libopencv_imgproc.so.%%VERSION%%
-lib/libopencv_ml.so
-lib/libopencv_ml.so.2
-lib/libopencv_ml.so.%%VERSION%%
-lib/libopencv_ts.so
-lib/libopencv_ts.so.2
-lib/libopencv_ts.so.%%VERSION%%
-lib/libopencv_video.so
-lib/libopencv_video.so.2
-lib/libopencv_video.so.%%VERSION%%
-libdata/pkgconfig/opencv-core.pc
-%%DATADIR%%/OpenCVConfig-core.cmake
-%%DATADIR%%/OpenCVConfig-core-version.cmake
- at dirrm %%DATADIR%%
- at dirrm include/opencv2/video
- at dirrm include/opencv2/ts
- at dirrm include/opencv2/ml
- at dirrm include/opencv2/imgproc
- at dirrm include/opencv2/flann
- at dirrm include/opencv2/core
- at dirrm include/opencv2
Deleted: trunk/graphics/opencv/pkg-plist.python
===================================================================
--- trunk/graphics/opencv/pkg-plist.python 2014-08-29 20:02:50 UTC (rev 16689)
+++ trunk/graphics/opencv/pkg-plist.python 2014-08-29 20:14:29 UTC (rev 16690)
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/cv2.so
-%%PYTHON_SITELIBDIR%%/cv.py
- at dirrmtry %%PYTHON_SITELIBDIR%%
More information about the Midnightbsd-cvs
mailing list