On Wed Nov 11, 2015 at 02:49:09AM -0800, Vadim Zhukov wrote:
> 2015-11-10 22:01 GMT-08:00 Rafael Sadowski <raf...@sizeofvoid.org>:
> > Hello @ports,
> >
> > update to the last stable 2.X branch before I'm ready with opencv 3.0.0
> > and doxygen update. Tested on amd64
> >
> >
> > Comments ? OK ?
> >
> > Best regards, Rafael
> >
> > [...]
> >
> > @lib lib/libopencv_video.so.${LIBopencv_video_VERSION}
> > @lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
> > lib/pkgconfig/opencv.pc
> > -lib/python${MODPY_VERSION}/site-packages/cv.py
> > -lib/python${MODPY_VERSION}/site-packages/cv.pyc
> > -lib/python${MODPY_VERSION}/site-packages/cv2.so
> > share/OpenCV/
> > share/OpenCV/OpenCVConfig-version.cmake
> > share/OpenCV/OpenCVConfig.cmake
>
> This hunk looks like suscipious. The Python support was removed?
> Couldn't that break ports depending on opencv in ports tree?
>
> --
> WBR,
> Vadim Zhukov
Thanks Vadim!
Hmm, confusing. I don't know why, maybe a python or my clock problem
(dual boot with win -- too busy to fix). But now it build the python2
stuff on my build machine and my T400s.
Could somebody build and check `make update-plist` for me?
apart of that ok?
Best regards, Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile 30 Jan 2015 21:38:37 -0000 1.34
+++ Makefile 12 Nov 2015 23:37:20 -0000
@@ -9,13 +9,11 @@ COMMENT-docs = OpenCV documentation and
COMMENT-main = library of programming functions for real time cv
COMMENT-java = Java bindings for OpenCV
-V = 2.4.10
+V = 2.4.12.3
DISTNAME = opencv-$V
PKGNAME-main = ${PKGNAME}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-$V
-REVISION-main = 1
-REVISION-java = 0
HOMEPAGE = http://www.opencv.org/
MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org>
@@ -40,8 +38,9 @@ SHARED_LIBS += opencv_video
1.0 #1.1
SHARED_LIBS += opencv_videostab 0.0 #0.1
SHARED_LIBS += opencv_ocl 0.0 #2.4
-EXTRACT_SUFX = .zip
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
+GH_ACCOUNT = Itseez
+GH_PROJECT = opencv
+GH_COMMIT = 8e40becab12c642e7bbafb9fe87698e8b6bf28da
WANTLIB-main = Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
@@ -82,7 +81,8 @@ MODULES = devel/cmake \
lang/python
BUILD_DEPENDS = devel/doxygen \
- math/py-numpy
+ math/py-numpy \
+ math/eigen3
RUN_DEPENDS-main = math/py-numpy
RUN_DEPENDS-docs = ${BUILD_PKGPATH},-main
@@ -111,6 +111,7 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC
# ATM opencv requires V4L1 compat, ask them to change it,
# then see WITH_V4L below.
CONFIGURE_ARGS = -DBUILD_opencv_nonfree:Bool=On \
+ -DBUILD_opencv_python:Bool=On \
-DWITH_1394:Bool=Off \
-DWITH_CUDA:Bool=Off \
-DWITH_EIGEN:Bool=Off \
@@ -120,7 +121,8 @@ CONFIGURE_ARGS = -DBUILD_opencv_nonfree:
-DWITH_JPEG:Bool=On \
-DWITH_PNG:Bool=On \
-DWITH_TIFF:Bool=On \
- -DWITH_V4L:Bool=Off
+ -DWITH_V4L:Bool=Off \
+ -DPYTHON_EXECUTABLE:FILEPATH=${MODPY_BIN}
.if ${BUILD_PACKAGES:M-java}
MODULES += java
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 24 Jan 2015 10:56:43 -0000 1.4
+++ distinfo 12 Nov 2015 23:37:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.10.zip) = G/TLhyg3l/2RZp1PkLYipnepA8ILSld7eViiFk91lsY=
-SIZE (opencv-2.4.10.zip) = 91692581
+SHA256 (opencv-2.4.12.3.tar.gz) = 7RAcJF+0UkxJ2cuLZ5SnAbTjphL29plAh8guhcazcTE=
+SIZE (opencv-2.4.12.3.tar.gz) = 90643425
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 24 Jan 2015 10:56:43 -0000 1.5
+++ patches/patch-CMakeLists_txt 12 Nov 2015 23:37:20 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2015/01/24 10:56:43 zhuk Exp $
---- CMakeLists.txt.orig Wed Oct 1 09:33:36 2014
-+++ CMakeLists.txt Sun Dec 21 20:16:55 2014
-@@ -438,7 +438,7 @@ if(UNIX)
+--- CMakeLists.txt.orig Mon Oct 26 08:56:34 2015
++++ CMakeLists.txt Tue Nov 3 01:10:55 2015
+@@ -451,7 +451,7 @@ if(UNIX)
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
if(ANDROID)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD")
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
- else()
- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m)
Index: patches/patch-cmake_OpenCVFindLibsVideo_cmake
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-cmake_OpenCVFindLibsVideo_cmake
--- patches/patch-cmake_OpenCVFindLibsVideo_cmake 24 Jan 2015 10:56:43
-0000 1.3
+++ patches/patch-cmake_OpenCVFindLibsVideo_cmake 12 Nov 2015 23:37:20
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.3 2015/01/24 10:56:43 zhuk
Exp $
---- cmake/OpenCVFindLibsVideo.cmake.orig Wed Oct 1 09:33:36 2014
-+++ cmake/OpenCVFindLibsVideo.cmake Sun Dec 21 20:16:55 2014
-@@ -162,7 +162,6 @@ if(WITH_V4L)
+--- cmake/OpenCVFindLibsVideo.cmake.orig Mon Oct 26 08:56:34 2015
++++ cmake/OpenCVFindLibsVideo.cmake Tue Nov 3 01:10:55 2015
+@@ -170,7 +170,6 @@ if(WITH_V4L)
endif()
endif()
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
Index: patches/patch-modules_core_include_opencv2_core_version_hpp
===================================================================
RCS file: patches/patch-modules_core_include_opencv2_core_version_hpp
diff -N patches/patch-modules_core_include_opencv2_core_version_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_core_include_opencv2_core_version_hpp 12 Nov 2015
23:37:20 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+git tag forgot to bump version
+
+--- modules/core/include/opencv2/core/version.hpp.orig Sat Nov 7 15:52:36 2015
++++ modules/core/include/opencv2/core/version.hpp Sat Nov 7 15:52:50 2015
+@@ -50,7 +50,7 @@
+ #define CV_VERSION_EPOCH 2
+ #define CV_VERSION_MAJOR 4
+ #define CV_VERSION_MINOR 12
+-#define CV_VERSION_REVISION 2
++#define CV_VERSION_REVISION 3
+
+ #define CVAUX_STR_EXP(__A) #__A
+ #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
Index: patches/patch-modules_core_src_system_cpp
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-modules_core_src_system_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_core_src_system_cpp
--- patches/patch-modules_core_src_system_cpp 26 Jan 2015 21:59:55 -0000
1.1
+++ patches/patch-modules_core_src_system_cpp 12 Nov 2015 23:37:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_core_src_system_cpp,v 1.1 2015/01/26 21:59:55 zhuk Exp
$
Fix build on i386.
---- modules/core/src/system.cpp.orig Wed Oct 1 11:33:36 2014
-+++ modules/core/src/system.cpp Tue Jan 27 00:34:47 2015
+--- modules/core/src/system.cpp.orig Mon Oct 26 08:56:34 2015
++++ modules/core/src/system.cpp Tue Nov 3 01:10:55 2015
@@ -253,6 +253,7 @@ struct HWFeatures
f.have[CV_CPU_AVX] = (((cpuid_data[2] & (1<<28)) !=
0)&&((cpuid_data[2] & (1<<27)) != 0));//OS uses XSAVE_XRSTORE and CPU support
AVX
}
@@ -10,7 +10,7 @@ Fix build on i386.
#if defined _MSC_VER && (defined _M_IX86 || defined _M_X64)
__cpuidex(cpuid_data, 7, 0);
#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
-@@ -285,6 +286,7 @@ struct HWFeatures
+@@ -288,6 +289,7 @@ struct HWFeatures
{
f.have[CV_CPU_AVX2] = (cpuid_data[1] & (1<<5)) != 0;
}
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-docs,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-docs
--- pkg/PLIST-docs 24 Jan 2015 10:56:43 -0000 1.7
+++ pkg/PLIST-docs 12 Nov 2015 23:37:20 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST-docs,v 1.7 2015/01/24 10:56:43 zhuk Exp $
share/OpenCV/samples/
+share/OpenCV/samples/CMakeLists.txt
share/OpenCV/samples/c/
+share/OpenCV/samples/c/CMakeLists.txt
share/OpenCV/samples/c/JCB.png
share/OpenCV/samples/c/adaptiveskindetector.cpp
share/OpenCV/samples/c/agaricus-lepiota.data
@@ -16,7 +18,6 @@ share/OpenCV/samples/c/build_all.sh
share/OpenCV/samples/c/cat.jpg
share/OpenCV/samples/c/contours.c
share/OpenCV/samples/c/convert_cascade.c
-share/OpenCV/samples/c/cvsample.dsp
share/OpenCV/samples/c/delaunay.c
share/OpenCV/samples/c/facedetect.cmd
share/OpenCV/samples/c/facedetect.cpp
@@ -34,6 +35,7 @@ share/OpenCV/samples/c/mushroom.cpp
share/OpenCV/samples/c/one_way_sample.cpp
share/OpenCV/samples/c/one_way_train_0000.jpg
share/OpenCV/samples/c/one_way_train_0001.jpg
+share/OpenCV/samples/c/one_way_train_images.txt
share/OpenCV/samples/c/polar_transforms.c
share/OpenCV/samples/c/puzzle.png
share/OpenCV/samples/c/pyramid_segmentation.c
@@ -43,6 +45,7 @@ share/OpenCV/samples/c/tree_engine.cpp
share/OpenCV/samples/c/waveform.data
share/OpenCV/samples/cpp/
share/OpenCV/samples/cpp/3calibration.cpp
+share/OpenCV/samples/cpp/CMakeLists.txt
share/OpenCV/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
share/OpenCV/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
share/OpenCV/samples/cpp/baboon.jpg
@@ -73,7 +76,9 @@ share/OpenCV/samples/cpp/drawing.cpp
share/OpenCV/samples/cpp/edge.cpp
share/OpenCV/samples/cpp/em.cpp
share/OpenCV/samples/cpp/fabmap_sample.cpp
+share/OpenCV/samples/cpp/facerec_at_t.txt
share/OpenCV/samples/cpp/facerec_demo.cpp
+share/OpenCV/samples/cpp/facial_features.cpp
share/OpenCV/samples/cpp/fback.cpp
share/OpenCV/samples/cpp/ffilldemo.cpp
share/OpenCV/samples/cpp/filestorage.cpp
@@ -165,9 +170,11 @@ share/OpenCV/samples/cpp/tsukuba_r.png
share/OpenCV/samples/cpp/tvl1_optical_flow.cpp
share/OpenCV/samples/cpp/video_dmtx.cpp
share/OpenCV/samples/cpp/video_homography.cpp
+share/OpenCV/samples/cpp/videocapture_pvapi.cpp
share/OpenCV/samples/cpp/videostab.cpp
share/OpenCV/samples/cpp/watershed.cpp
share/OpenCV/samples/gpu/
+share/OpenCV/samples/gpu/CMakeLists.txt
share/OpenCV/samples/gpu/aloeL.jpg
share/OpenCV/samples/gpu/aloeR.jpg
share/OpenCV/samples/gpu/alpha_comp.cpp
@@ -176,19 +183,15 @@ share/OpenCV/samples/gpu/basketball2.png
share/OpenCV/samples/gpu/bgfg_segm.cpp
share/OpenCV/samples/gpu/brox_optical_flow.cpp
share/OpenCV/samples/gpu/cascadeclassifier.cpp
-share/OpenCV/samples/gpu/cascadeclassifier_nvidia_api.cpp
-share/OpenCV/samples/gpu/driver_api_multi.cpp
-share/OpenCV/samples/gpu/driver_api_stereo_multi.cpp
share/OpenCV/samples/gpu/farneback_optical_flow.cpp
share/OpenCV/samples/gpu/generalized_hough.cpp
share/OpenCV/samples/gpu/hog.cpp
share/OpenCV/samples/gpu/houghlines.cpp
share/OpenCV/samples/gpu/morphology.cpp
share/OpenCV/samples/gpu/multi.cpp
-share/OpenCV/samples/gpu/opengl.cpp
share/OpenCV/samples/gpu/optical_flow.cpp
-share/OpenCV/samples/gpu/opticalflow_nvidia_api.cpp
share/OpenCV/samples/gpu/performance/
+share/OpenCV/samples/gpu/performance/CMakeLists.txt
share/OpenCV/samples/gpu/performance/performance.cpp
share/OpenCV/samples/gpu/performance/performance.h
share/OpenCV/samples/gpu/performance/tests.cpp
@@ -205,6 +208,7 @@ share/OpenCV/samples/gpu/tsucuba_right.p
share/OpenCV/samples/gpu/video_reader.cpp
share/OpenCV/samples/gpu/video_writer.cpp
share/OpenCV/samples/ocl/
+share/OpenCV/samples/ocl/CMakeLists.txt
share/OpenCV/samples/ocl/adaptive_bilateral_filter.cpp
share/OpenCV/samples/ocl/bgfg_segm.cpp
share/OpenCV/samples/ocl/clahe.cpp
@@ -215,6 +219,58 @@ share/OpenCV/samples/ocl/squares.cpp
share/OpenCV/samples/ocl/stereo_match.cpp
share/OpenCV/samples/ocl/surf_matcher.cpp
share/OpenCV/samples/ocl/tvl1_optical_flow.cpp
+share/OpenCV/samples/python2/
+share/OpenCV/samples/python2/_coverage.py
+share/OpenCV/samples/python2/_doc.py
+share/OpenCV/samples/python2/asift.py
+share/OpenCV/samples/python2/browse.py
+share/OpenCV/samples/python2/calibrate.py
+share/OpenCV/samples/python2/camshift.py
+share/OpenCV/samples/python2/coherence.py
+share/OpenCV/samples/python2/color_histogram.py
+share/OpenCV/samples/python2/common.py
+share/OpenCV/samples/python2/contours.py
+share/OpenCV/samples/python2/deconvolution.py
+share/OpenCV/samples/python2/demo.py
+share/OpenCV/samples/python2/dft.py
+share/OpenCV/samples/python2/digits.py
+share/OpenCV/samples/python2/digits_adjust.py
+share/OpenCV/samples/python2/digits_video.py
+share/OpenCV/samples/python2/distrans.py
+share/OpenCV/samples/python2/edge.py
+share/OpenCV/samples/python2/facedetect.py
+share/OpenCV/samples/python2/facerec_demo.py
+share/OpenCV/samples/python2/feature_homography.py
+share/OpenCV/samples/python2/find_obj.py
+share/OpenCV/samples/python2/fitline.py
+share/OpenCV/samples/python2/floodfill.py
+share/OpenCV/samples/python2/gabor_threads.py
+share/OpenCV/samples/python2/gaussian_mix.py
+share/OpenCV/samples/python2/grabcut.py
+share/OpenCV/samples/python2/hist.py
+share/OpenCV/samples/python2/inpaint.py
+share/OpenCV/samples/python2/kmeans.py
+share/OpenCV/samples/python2/lappyr.py
+share/OpenCV/samples/python2/letter_recog.py
+share/OpenCV/samples/python2/lk_homography.py
+share/OpenCV/samples/python2/lk_track.py
+share/OpenCV/samples/python2/morphology.py
+share/OpenCV/samples/python2/mosse.py
+share/OpenCV/samples/python2/motempl.py
+share/OpenCV/samples/python2/mouse_and_match.py
+share/OpenCV/samples/python2/mser.py
+share/OpenCV/samples/python2/opt_flow.py
+share/OpenCV/samples/python2/peopledetect.py
+share/OpenCV/samples/python2/plane_ar.py
+share/OpenCV/samples/python2/plane_tracker.py
+share/OpenCV/samples/python2/squares.py
+share/OpenCV/samples/python2/stereo_match.py
+share/OpenCV/samples/python2/texture_flow.py
+share/OpenCV/samples/python2/turing.py
+share/OpenCV/samples/python2/video.py
+share/OpenCV/samples/python2/video_dmtx.py
+share/OpenCV/samples/python2/video_threaded.py
+share/OpenCV/samples/python2/watershed.py
share/doc/OpenCV/
share/doc/OpenCV/acircles_pattern.png
share/doc/OpenCV/haartraining.htm
@@ -1493,7 +1549,6 @@ share/doc/OpenCV/html/_static/doctools.j
share/doc/OpenCV/html/_static/down-pressed.png
share/doc/OpenCV/html/_static/down.png
share/doc/OpenCV/html/_static/file.png
-share/doc/OpenCV/html/_static/insertIframe.js
share/doc/OpenCV/html/_static/jquery.js
share/doc/OpenCV/html/_static/minus.png
share/doc/OpenCV/html/_static/opencv-logo-white.png
Index: pkg/PLIST-java
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-java
--- pkg/PLIST-java 24 Jan 2015 10:56:43 -0000 1.3
+++ pkg/PLIST-java 12 Nov 2015 23:37:20 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.3 2015/01/24 10:56:43 zhuk Exp $
lib/OpenCV/
lib/OpenCV/java/
-lib/OpenCV/java/libopencv_java2410.so
-lib/OpenCV/java/opencv-2410.jar
+lib/OpenCV/java/libopencv_java2412.so
+lib/OpenCV/java/opencv-2412.jar
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 24 Jan 2015 10:56:43 -0000 1.4
+++ pkg/PLIST-main 12 Nov 2015 23:37:20 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.4 2015/01/24 10:56:43 zhuk Exp $
+@bin bin/opencv_annotation
@bin bin/opencv_createsamples
@bin bin/opencv_haartraining
@bin bin/opencv_performance
@@ -17,6 +18,7 @@ include/opencv/highgui.h
include/opencv/ml.h
include/opencv2/
include/opencv2/calib3d/
+include/opencv2/calib3d.hpp
include/opencv2/calib3d/calib3d.hpp
include/opencv2/contrib/
include/opencv2/contrib/contrib.hpp
@@ -25,6 +27,7 @@ include/opencv2/contrib/hybridtracker.hp
include/opencv2/contrib/openfabmap.hpp
include/opencv2/contrib/retina.hpp
include/opencv2/core/
+include/opencv2/core.hpp
include/opencv2/core/affine.hpp
include/opencv2/core/core.hpp
include/opencv2/core/core_c.h
@@ -41,8 +44,10 @@ include/opencv2/core/types_c.h
include/opencv2/core/version.hpp
include/opencv2/core/wimage.hpp
include/opencv2/features2d/
+include/opencv2/features2d.hpp
include/opencv2/features2d/features2d.hpp
include/opencv2/flann/
+include/opencv2/flann.hpp
include/opencv2/flann/all_indices.h
include/opencv2/flann/allocator.h
include/opencv2/flann/any.h
@@ -118,11 +123,13 @@ include/opencv2/gpu/gpu.hpp
include/opencv2/gpu/gpumat.hpp
include/opencv2/gpu/stream_accessor.hpp
include/opencv2/highgui/
+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
include/opencv2/imgproc/
+include/opencv2/imgproc.hpp
include/opencv2/imgproc/imgproc.hpp
include/opencv2/imgproc/imgproc_c.h
include/opencv2/imgproc/types_c.h
@@ -132,6 +139,7 @@ include/opencv2/legacy/compat.hpp
include/opencv2/legacy/legacy.hpp
include/opencv2/legacy/streams.hpp
include/opencv2/ml/
+include/opencv2/ml.hpp
include/opencv2/ml/ml.hpp
include/opencv2/nonfree/
include/opencv2/nonfree/features2d.hpp
@@ -139,6 +147,7 @@ include/opencv2/nonfree/gpu.hpp
include/opencv2/nonfree/nonfree.hpp
include/opencv2/nonfree/ocl.hpp
include/opencv2/objdetect/
+include/opencv2/objdetect.hpp
include/opencv2/objdetect/objdetect.hpp
include/opencv2/ocl/
include/opencv2/ocl/matrix_operations.hpp
@@ -146,9 +155,11 @@ include/opencv2/ocl/ocl.hpp
include/opencv2/opencv.hpp
include/opencv2/opencv_modules.hpp
include/opencv2/photo/
+include/opencv2/photo.hpp
include/opencv2/photo/photo.hpp
include/opencv2/photo/photo_c.h
include/opencv2/stitching/
+include/opencv2/stitching.hpp
include/opencv2/stitching/detail/
include/opencv2/stitching/detail/autocalib.hpp
include/opencv2/stitching/detail/blenders.hpp
@@ -164,19 +175,23 @@ include/opencv2/stitching/detail/warpers
include/opencv2/stitching/stitcher.hpp
include/opencv2/stitching/warpers.hpp
include/opencv2/superres/
+include/opencv2/superres.hpp
include/opencv2/superres/optical_flow.hpp
include/opencv2/superres/superres.hpp
include/opencv2/ts/
+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/
+include/opencv2/video.hpp
include/opencv2/video/background_segm.hpp
include/opencv2/video/tracking.hpp
include/opencv2/video/video.hpp
include/opencv2/videostab/
+include/opencv2/videostab.hpp
include/opencv2/videostab/deblurring.hpp
include/opencv2/videostab/fast_marching.hpp
include/opencv2/videostab/fast_marching_inl.hpp
@@ -219,12 +234,15 @@ share/OpenCV/OpenCVModules.cmake
share/OpenCV/haarcascades/
share/OpenCV/haarcascades/haarcascade_eye.xml
share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
+share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
+share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
share/OpenCV/haarcascades/haarcascade_fullbody.xml
share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
+share/OpenCV/haarcascades/haarcascade_licence_plate_rus_16stages.xml
share/OpenCV/haarcascades/haarcascade_lowerbody.xml
share/OpenCV/haarcascades/haarcascade_mcs_eyepair_big.xml
share/OpenCV/haarcascades/haarcascade_mcs_eyepair_small.xml
@@ -237,9 +255,11 @@ share/OpenCV/haarcascades/haarcascade_mc
share/OpenCV/haarcascades/haarcascade_mcs_upperbody.xml
share/OpenCV/haarcascades/haarcascade_profileface.xml
share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml
+share/OpenCV/haarcascades/haarcascade_russian_plate_number.xml
share/OpenCV/haarcascades/haarcascade_smile.xml
share/OpenCV/haarcascades/haarcascade_upperbody.xml
share/OpenCV/lbpcascades/
+share/OpenCV/lbpcascades/lbpcascade_frontalcatface.xml
share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
share/OpenCV/lbpcascades/lbpcascade_profileface.xml
share/OpenCV/lbpcascades/lbpcascade_silverware.xml
