svn commit: r423275 - in branches/2016Q4/graphics: opencv opencv-core opencv-java opencv/files py-opencv
Jan Beich
jbeich at FreeBSD.org
Tue Oct 4 15:51:37 UTC 2016
Author: jbeich
Date: Tue Oct 4 15:51:35 2016
New Revision: 423275
URL: https://svnweb.freebsd.org/changeset/ports/423275
Log:
MFH: r423215
graphics/opencv: update to 2.4.13.1
Changes: https://github.com/opencv/opencv/compare/2.4.9...2.4.13.1
ABI: https://abi-laboratory.pro/tracker/timeline/opencv/
Approved by: ports-secteam (feld)
Deleted:
branches/2016Q4/graphics/opencv/files/patch-apps__traincascade__imagestorage.h
branches/2016Q4/graphics/opencv/files/patch-ffmpeg29
branches/2016Q4/graphics/opencv/files/patch-libav10
branches/2016Q4/graphics/opencv/files/patch-modules_legacy_src_calibfilter.cpp
branches/2016Q4/graphics/opencv/files/patch-pkg-config
Modified:
branches/2016Q4/graphics/opencv-core/Makefile
branches/2016Q4/graphics/opencv-core/pkg-plist
branches/2016Q4/graphics/opencv-java/Makefile
branches/2016Q4/graphics/opencv/Makefile
branches/2016Q4/graphics/opencv/distinfo
branches/2016Q4/graphics/opencv/files/patch-modules__core__src__system.cpp
branches/2016Q4/graphics/opencv/pkg-plist
branches/2016Q4/graphics/py-opencv/Makefile
Directory Properties:
branches/2016Q4/ (props changed)
Modified: branches/2016Q4/graphics/opencv-core/Makefile
==============================================================================
--- branches/2016Q4/graphics/opencv-core/Makefile Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv-core/Makefile Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,7 +1,7 @@
# Created by: Martin Matuska <mm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
PKGNAMESUFFIX= -${OCV_SLAVE}
COMMENT= OpenCV core libraries
Modified: branches/2016Q4/graphics/opencv-core/pkg-plist
==============================================================================
--- branches/2016Q4/graphics/opencv-core/pkg-plist Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv-core/pkg-plist Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,3 +1,4 @@
+include/opencv2/core.hpp
include/opencv2/core/affine.hpp
include/opencv2/core/core.hpp
include/opencv2/core/core_c.h
@@ -13,6 +14,7 @@ include/opencv2/core/operations.hpp
include/opencv2/core/types_c.h
include/opencv2/core/version.hpp
include/opencv2/core/wimage.hpp
+include/opencv2/imgproc.hpp
include/opencv2/imgproc/imgproc.hpp
include/opencv2/imgproc/imgproc_c.h
include/opencv2/imgproc/types_c.h
Modified: branches/2016Q4/graphics/opencv-java/Makefile
==============================================================================
--- branches/2016Q4/graphics/opencv-java/Makefile Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv-java/Makefile Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= graphics java
PKGNAMESUFFIX= -${OCV_SLAVE}
@@ -11,6 +11,6 @@ OCV_JAVA= yes
MASTERDIR= ${.CURDIR:H}/opencv
PLIST= ${.CURDIR}/pkg-plist
-PLIST_SUB+= OCV_VER=${PORTVERSION:S|.||g}
+PLIST_SUB+= OCV_VER=${DISTVERSION:R:S|.||g}
.include "${MASTERDIR}/Makefile"
Modified: branches/2016Q4/graphics/opencv/Makefile
==============================================================================
--- branches/2016Q4/graphics/opencv/Makefile Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv/Makefile Tue Oct 4 15:51:35 2016 (r423275)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= opencv
-PORTVERSION= 2.4.9
-PORTREVISION?= 8
+PORTVERSION= 2.4.13.1
+PORTREVISION?= 0
CATEGORIES= graphics
MAINTAINER= ports at FreeBSD.org
@@ -22,18 +22,18 @@ NOT_FOR_ARCHS= sparc64
NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64
DATADIR= ${PREFIX}/share/OpenCV
-PLIST_SUB+= VERSION=${DISTVERSION}
+PLIST_SUB+= VERSION=${DISTVERSION:R}
CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \
-DWITH_PVAPI:BOOL=Off \
-DWITH_UNICAP:BOOL=Off \
- -DENABLE_PRECOMPILED_HEADERS:BOOL=Off \
-DBUILD_TESTS:BOOL=Off \
-DBUILD_DOCS:BOOL=Off \
+ -DENABLE_PRECOMPILED_HEADERS:BOOL=Off \
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
SUB_FILES= FindOpenCVCore.cmake
-SUB_LIST= OCV_VERSION=${PORTVERSION}
+SUB_LIST= OCV_VERSION=${DISTVERSION:R}
OCV_CORE_MODS= core imgproc
OCV_MODS= calib3d contrib features2d flann gpu \
@@ -50,15 +50,15 @@ OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB
OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}}
OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386}
OPTIONS_GROUP_SIMD_armv6= NEON VFPV3
-OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX
-OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER V4L XINE
+OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2
+OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER GSTREAMER0 V4L XINE
OPTIONS_RADIO= GUI
OPTIONS_RADIO_GUI= GTK2 QT4
OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu}
OPTIONS_SUB= yes
.if defined(OCV_CORE)
OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \
- OPENGL PNG TIFF FFMPEG GSTREAMER V4L XINE
+ OPENGL PNG TIFF FFMPEG GSTREAMER GSTREAMER0 V4L XINE
.endif
DC1394_DESC= IEEE 1394 camera support
@@ -77,7 +77,11 @@ EXAMPLES_PORTEXAMPLES= *
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
FFMPEG_CMAKE_BOOL= WITH_FFMPEG
-GSTREAMER_USE= GSTREAMER=yes
+GSTREAMER0_DESC= ${GSTREAMER_DESC} 0.10
+GSTREAMER0_USE= GSTREAMER=yes
+GSTREAMER0_CMAKE_BOOL= WITH_GSTREAMER_0_10
+
+GSTREAMER_USE= GSTREAMER1=yes
GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER
GTK2_USE= GNOME=gtk20
Modified: branches/2016Q4/graphics/opencv/distinfo
==============================================================================
--- branches/2016Q4/graphics/opencv/distinfo Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv/distinfo Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475284055
-SHA256 (opencv-opencv-2.4.9_GH0.tar.gz) = b5b88a64bf80ba953ffe8c33f3e00046edb773ada8aaaab7538c0059a45d1259
-SIZE (opencv-opencv-2.4.9_GH0.tar.gz) = 89071769
+TIMESTAMP = 1475482010
+SHA256 (opencv-opencv-2.4.13.1_GH0.tar.gz) = 0d5ce5e0973e3a745f927d1ee097aaf909aae59f787be6d27a03d639e2d96bd7
+SIZE (opencv-opencv-2.4.13.1_GH0.tar.gz) = 91773677
Modified: branches/2016Q4/graphics/opencv/files/patch-modules__core__src__system.cpp
==============================================================================
--- branches/2016Q4/graphics/opencv/files/patch-modules__core__src__system.cpp Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv/files/patch-modules__core__src__system.cpp Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,15 +1,15 @@
---- ./modules/core/src/system.cpp.orig 2013-11-25 05:42:32.000000000 -0500
-+++ ./modules/core/src/system.cpp 2013-11-25 05:42:42.000000000 -0500
-@@ -126,7 +126,7 @@
+--- modules/core/src/system.cpp.orig 2016-09-16 15:55:58 UTC
++++ modules/core/src/system.cpp
+@@ -157,7 +157,7 @@ std::wstring GetTempFileNameWinRT(std::w
#include <stdarg.h>
--#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__
-+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__
+-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__
++#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__ || defined __FreeBSD__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
-@@ -897,14 +897,23 @@
+@@ -942,14 +942,23 @@ struct Mutex::Impl
struct Mutex::Impl
{
@@ -22,19 +22,19 @@
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&mt, &attr);
+ pthread_mutexattr_destroy(&attr);
-
-- void lock() { pthread_mutex_lock(&sl); }
-- bool trylock() { return pthread_mutex_trylock(&sl) == 0; }
-- void unlock() { pthread_mutex_unlock(&sl); }
++
+ refcount = 1;
+ }
+ ~Impl() { pthread_mutex_destroy(&mt); }
-- pthread_mutex_t sl;
+- void lock() { pthread_mutex_lock(&sl); }
+- bool trylock() { return pthread_mutex_trylock(&sl) == 0; }
+- void unlock() { pthread_mutex_unlock(&sl); }
+ void lock() { pthread_mutex_lock(&mt); }
+ bool trylock() { return pthread_mutex_trylock(&mt) == 0; }
+ void unlock() { pthread_mutex_unlock(&mt); }
-+
+
+- pthread_mutex_t sl;
+ pthread_mutex_t mt;
int refcount;
};
Modified: branches/2016Q4/graphics/opencv/pkg-plist
==============================================================================
--- branches/2016Q4/graphics/opencv/pkg-plist Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/opencv/pkg-plist Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,7 +1,9 @@
+bin/opencv_annotation
bin/opencv_createsamples
bin/opencv_haartraining
bin/opencv_performance
bin/opencv_traincascade
+bin/opencv_visualisation
include/opencv/cv.h
include/opencv/cv.hpp
include/opencv/cvaux.h
@@ -13,13 +15,17 @@ include/opencv/cxeigen.hpp
include/opencv/cxmisc.h
include/opencv/highgui.h
include/opencv/ml.h
+include/opencv2/calib3d.hpp
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
+ at comment include/opencv2/core.hpp
+include/opencv2/features2d.hpp
include/opencv2/features2d/features2d.hpp
+include/opencv2/flann.hpp
include/opencv2/flann/all_indices.h
include/opencv2/flann/allocator.h
include/opencv2/flann/any.h
@@ -91,26 +97,32 @@ include/opencv2/gpu/devmem2d.hpp
include/opencv2/gpu/gpu.hpp
include/opencv2/gpu/gpumat.hpp
include/opencv2/gpu/stream_accessor.hpp
+include/opencv2/highgui.hpp
include/opencv2/highgui/cap_ios.h
include/opencv2/highgui/highgui.hpp
include/opencv2/highgui/highgui_c.h
include/opencv2/highgui/ios.h
+ at comment include/opencv2/imgproc.hpp
include/opencv2/legacy/blobtrack.hpp
include/opencv2/legacy/compat.hpp
include/opencv2/legacy/legacy.hpp
include/opencv2/legacy/streams.hpp
+include/opencv2/ml.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.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.hpp
include/opencv2/photo/photo.hpp
include/opencv2/photo/photo_c.h
+include/opencv2/stitching.hpp
include/opencv2/stitching/detail/autocalib.hpp
include/opencv2/stitching/detail/blenders.hpp
include/opencv2/stitching/detail/camera.hpp
@@ -124,16 +136,20 @@ include/opencv2/stitching/detail/warpers
include/opencv2/stitching/detail/warpers_inl.hpp
include/opencv2/stitching/stitcher.hpp
include/opencv2/stitching/warpers.hpp
+include/opencv2/superres.hpp
include/opencv2/superres/optical_flow.hpp
include/opencv2/superres/superres.hpp
+include/opencv2/ts.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.hpp
include/opencv2/video/background_segm.hpp
include/opencv2/video/tracking.hpp
include/opencv2/video/video.hpp
+include/opencv2/videostab.hpp
include/opencv2/videostab/deblurring.hpp
include/opencv2/videostab/fast_marching.hpp
include/opencv2/videostab/fast_marching_inl.hpp
@@ -201,12 +217,15 @@ libdata/pkgconfig/opencv.pc
%%DATADIR%%/OpenCVModules.cmake
%%DATADIR%%/haarcascades/haarcascade_eye.xml
%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
+%%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml
+%%DATADIR%%/haarcascades/haarcascade_frontalcatface_extended.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt2.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt_tree.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml
%%DATADIR%%/haarcascades/haarcascade_fullbody.xml
%%DATADIR%%/haarcascades/haarcascade_lefteye_2splits.xml
+%%DATADIR%%/haarcascades/haarcascade_licence_plate_rus_16stages.xml
%%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_big.xml
%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_small.xml
@@ -219,8 +238,10 @@ libdata/pkgconfig/opencv.pc
%%DATADIR%%/haarcascades/haarcascade_mcs_upperbody.xml
%%DATADIR%%/haarcascades/haarcascade_profileface.xml
%%DATADIR%%/haarcascades/haarcascade_righteye_2splits.xml
+%%DATADIR%%/haarcascades/haarcascade_russian_plate_number.xml
%%DATADIR%%/haarcascades/haarcascade_smile.xml
%%DATADIR%%/haarcascades/haarcascade_upperbody.xml
+%%DATADIR%%/lbpcascades/lbpcascade_frontalcatface.xml
%%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml
%%DATADIR%%/lbpcascades/lbpcascade_profileface.xml
%%DATADIR%%/lbpcascades/lbpcascade_silverware.xml
Modified: branches/2016Q4/graphics/py-opencv/Makefile
==============================================================================
--- branches/2016Q4/graphics/py-opencv/Makefile Tue Oct 4 15:46:51 2016 (r423274)
+++ branches/2016Q4/graphics/py-opencv/Makefile Tue Oct 4 15:51:35 2016 (r423275)
@@ -1,7 +1,7 @@
# Created by: Martin Matuska <mm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
More information about the svn-ports-all
mailing list