Update OpenCV to 2.4.9. Initial patch from Rafael Sadowski (MAINTAINER),

with some tweaks from me, including enabling -java back on i386.

Tested on i386 and amd64.
This commit is contained in:
zhuk 2014-06-03 20:41:36 +00:00
parent ff0374b184
commit f2442e68ef
11 changed files with 194 additions and 74 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.25 2014/05/08 21:23:21 kurt Exp $
# $OpenBSD: Makefile,v 1.26 2014/06/03 20:41:36 zhuk Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
# do not include i386 here until JDK 1.6 issues there are solved
ONLY_FOR_ARCHS-java = amd64
ONLY_FOR_ARCHS-java = amd64 i386
SHARED_ONLY = Yes
CATEGORIES = graphics devel
@ -10,37 +9,36 @@ COMMENT-docs = OpenCV documentation and examples
COMMENT-main = library of programming functions for real time cv
COMMENT-java = Java bindings for OpenCV
V = 2.4.6.1
V = 2.4.9
DISTNAME = opencv-$V
PKGNAME-main = ${PKGNAME}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-$V
REVISION-main= 0
REVISION-java= 0
HOMEPAGE = http://www.opencv.org/
MAINTAINER = Rafael Sadowski <rafael@sizeofvoid.org>
SHARED_LIBS = opencv_calib3d 1.0 #1.0
SHARED_LIBS += opencv_contrib 1.0 #1.0
SHARED_LIBS += opencv_core 1.0 #1.0
SHARED_LIBS += opencv_features2d 1.0 #1.0
SHARED_LIBS += opencv_flann 1.0 #1.0
SHARED_LIBS += opencv_gpu 1.0 #1.0
SHARED_LIBS += opencv_highgui 1.0 #1.0
SHARED_LIBS += opencv_imgproc 1.0 #1.0
SHARED_LIBS += opencv_legacy 1.0 #1.0
SHARED_LIBS += opencv_ml 1.0 #1.0
SHARED_LIBS += opencv_nonfree 0.0 #0.0
SHARED_LIBS += opencv_objdetect 1.0 #1.0
SHARED_LIBS += opencv_photo 0.0 #0.0
SHARED_LIBS += opencv_stitching 0.0 #0.0
SHARED_LIBS += opencv_superres 0.0 #0.0
SHARED_LIBS += opencv_ts 0.0 #0.0
SHARED_LIBS += opencv_video 1.0 #1.0
SHARED_LIBS += opencv_videostab 0.0 #0.0
SHARED_LIBS = opencv_calib3d 1.0 #1.1
SHARED_LIBS += opencv_contrib 1.0 #1.1
SHARED_LIBS += opencv_core 1.0 #1.1
SHARED_LIBS += opencv_features2d 1.0 #1.1
SHARED_LIBS += opencv_flann 1.0 #1.1
SHARED_LIBS += opencv_gpu 1.0 #1.1
SHARED_LIBS += opencv_highgui 1.0 #1.1
SHARED_LIBS += opencv_imgproc 1.0 #1.1
SHARED_LIBS += opencv_legacy 1.0 #1.1
SHARED_LIBS += opencv_ml 1.0 #1.1
SHARED_LIBS += opencv_nonfree 0.0 #0.1
SHARED_LIBS += opencv_objdetect 1.0 #1.1
SHARED_LIBS += opencv_photo 0.0 #0.1
SHARED_LIBS += opencv_stitching 0.0 #0.1
SHARED_LIBS += opencv_superres 0.0 #0.1
SHARED_LIBS += opencv_ts 0.0 #0.1
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/}
WANTLIB-main = Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
@ -115,7 +113,7 @@ CONFIGURE_ARGS = -DBUILD_opencv_nonfree:Bool=On \
.if ${BUILD_PACKAGES:M-java}
MODULES += java
MODJAVA_VER = 1.6+
MODJAVA_VER = 1.7+
BUILD_DEPENDS += devel/apache-ant
.else
# Safe: Java will be detected, if present, but won't be used

View File

@ -1,2 +1,2 @@
SHA256 (opencv-2.4.6.1.tar.gz) = rnz9hZR2tswFJGlJ3csWX7KE6vmm2BSyl23CEIh3iqA=
SIZE (opencv-2.4.6.1.tar.gz) = 80762052
SHA256 (opencv-2.4.9.zip) = gDAQhIFUmI6cvaiz+oV/y7JzgsKUbtcp4afkBgC7THE=
SIZE (opencv-2.4.9.zip) = 91684751

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/10/21 22:46:27 zhuk Exp $
--- CMakeLists.txt.orig Fri Jun 28 19:47:30 2013
+++ CMakeLists.txt Sat Jul 27 21:43:25 2013
@@ -376,7 +376,7 @@ if(UNIX)
$OpenBSD: patch-CMakeLists_txt,v 1.4 2014/06/03 20:41:36 zhuk Exp $
--- CMakeLists.txt.orig Fri Apr 11 12:15:26 2014
+++ CMakeLists.txt Mon May 26 22:11:21 2014
@@ -432,7 +432,7 @@ if(UNIX)
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
if(ANDROID)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.1 2013/10/21 22:46:27 zhuk Exp $
--- cmake/OpenCVFindLibsVideo.cmake.orig Fri Jun 28 19:47:30 2013
+++ cmake/OpenCVFindLibsVideo.cmake Sat Jul 27 21:43:25 2013
@@ -121,7 +121,6 @@ ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HA
if(WITH_V4L)
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.2 2014/06/03 20:41:36 zhuk Exp $
--- cmake/OpenCVFindLibsVideo.cmake.orig Wed Nov 6 15:26:39 2013
+++ cmake/OpenCVFindLibsVideo.cmake Sun Jan 5 09:13:06 2014
@@ -129,7 +129,6 @@ if(WITH_V4L)
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
endif()
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cmake_OpenCVUtils_cmake,v 1.1 2013/10/21 22:46:27 zhuk Exp $
--- cmake/OpenCVUtils.cmake.orig Fri Jun 28 19:47:30 2013
+++ cmake/OpenCVUtils.cmake Sat Jul 27 21:43:25 2013
@@ -227,11 +227,31 @@ macro(CHECK_MODULE module_name define)
$OpenBSD: patch-cmake_OpenCVUtils_cmake,v 1.2 2014/06/03 20:41:36 zhuk Exp $
--- cmake/OpenCVUtils.cmake.orig Wed Nov 6 15:26:39 2013
+++ cmake/OpenCVUtils.cmake Sun Jan 5 09:13:06 2014
@@ -250,11 +250,31 @@ macro(CHECK_MODULE module_name define)
endif()
endforeach()

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-modules_core_include_opencv2_core_operations_hpp,v 1.1 2014/01/23 15:21:31 zhuk Exp $
$OpenBSD: patch-modules_core_include_opencv2_core_operations_hpp,v 1.2 2014/06/03 20:41:36 zhuk Exp $
All to build on sparc64 at least.
--- modules/core/include/opencv2/core/operations.hpp.orig Sun Jan 19 14:25:06 2014
+++ modules/core/include/opencv2/core/operations.hpp Sun Jan 19 14:25:28 2014
--- modules/core/include/opencv2/core/operations.hpp.orig Fri Apr 11 14:15:26 2014
+++ modules/core/include/opencv2/core/operations.hpp Sun Jun 1 13:12:28 2014
@@ -65,7 +65,7 @@
#elif __GNUC__*10 + __GNUC_MINOR__ >= 42
#if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
- defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__) || \
+ defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__ || defined _GLIBCXX_ATOMIC_BUILTINS ) || \
(defined __GNUC__ && defined _STLPORT_MAJOR)
#define CV_XADD __sync_fetch_and_add
#else
+ defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__ || defined _GLIBCXX_ATOMIC_BUILTINS) || \
(defined __GNUC__ && defined _STLPORT_MAJOR) || \
defined __EMSCRIPTEN__

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-modules_java_CMakeLists_txt,v 1.1 2013/10/21 22:46:28 zhuk Exp $
$OpenBSD: patch-modules_java_CMakeLists_txt,v 1.2 2014/06/03 20:41:36 zhuk Exp $
JNI shared object is installed in the same directory, so this should
be under lib/.
--- modules/java/CMakeLists.txt.orig Sat Jul 27 23:22:08 2013
+++ modules/java/CMakeLists.txt Sat Jul 27 23:28:22 2013
@@ -263,7 +263,7 @@ else(ANDROID)
--- modules/java/CMakeLists.txt.orig Fri Apr 11 12:15:26 2014
+++ modules/java/CMakeLists.txt Mon May 26 22:11:21 2014
@@ -280,7 +280,7 @@ else(ANDROID)
if(WIN32)
set(JAR_INSTALL_DIR java)
else(WIN32)
- set(JAR_INSTALL_DIR share/OpenCV/java)
+ set(JAR_INSTALL_DIR lib/OpenCV/java)
endif(WIN32)
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
endif(ANDROID)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-modules_ts_CMakeLists_txt,v 1.1 2014/06/03 20:41:36 zhuk Exp $
--- modules/ts/CMakeLists.txt.orig Fri Apr 11 12:15:26 2014
+++ modules/ts/CMakeLists.txt Mon May 26 22:11:21 2014
@@ -4,8 +4,8 @@ if(IOS)
ocv_module_disable(ts)
endif()
-set(OPENCV_MODULE_TYPE STATIC)
-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
+#set(OPENCV_MODULE_TYPE STATIC)
+#set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.4 2013/10/21 22:46:29 zhuk Exp $
@comment $OpenBSD: PLIST-docs,v 1.5 2014/06/03 20:41:36 zhuk Exp $
share/OpenCV/samples/
share/OpenCV/samples/c/
share/OpenCV/samples/c/JCB.png
@ -43,8 +43,8 @@ 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/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp
share/OpenCV/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp
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
share/OpenCV/samples/cpp/bagofwords_classification.cpp
share/OpenCV/samples/cpp/bgfg_gmg.cpp
@ -87,8 +87,10 @@ share/OpenCV/samples/cpp/houghcircles.cpp
share/OpenCV/samples/cpp/houghlines.cpp
share/OpenCV/samples/cpp/hybridtrackingsample.cpp
share/OpenCV/samples/cpp/image.cpp
share/OpenCV/samples/cpp/image_sequence.cpp
share/OpenCV/samples/cpp/imagelist_creator.cpp
share/OpenCV/samples/cpp/inpaint.cpp
share/OpenCV/samples/cpp/intelperc_capture.cpp
share/OpenCV/samples/cpp/kalman.cpp
share/OpenCV/samples/cpp/kmeans.cpp
share/OpenCV/samples/cpp/laplace.cpp
@ -203,6 +205,8 @@ share/OpenCV/samples/gpu/tsucuba_right.png
share/OpenCV/samples/gpu/video_reader.cpp
share/OpenCV/samples/gpu/video_writer.cpp
share/OpenCV/samples/ocl/
share/OpenCV/samples/ocl/adaptive_bilateral_filter.cpp
share/OpenCV/samples/ocl/bgfg_segm.cpp
share/OpenCV/samples/ocl/clahe.cpp
share/OpenCV/samples/ocl/facedetect.cpp
share/OpenCV/samples/ocl/hog.cpp
@ -354,6 +358,8 @@ share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/android_binary_packag
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/android_binary_package/O4A_SDK.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/android_binary_package/android_dev_intro.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/clojure_dev_intro/
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/crosscompilation/
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/desktop_java/
@ -364,6 +370,8 @@ share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/how_to_write_a_tutori
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/ios_install/
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/ios_install/ios_install.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/java_eclipse/
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/java_eclipse/java_eclipse.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/linux_eclipse/
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/linux_eclipse/linux_eclipse.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/introduction/linux_gcc_cmake/
@ -405,9 +413,21 @@ share/doc/OpenCV/html/.doctrees/doc/tutorials/tutorials.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/video/
share/doc/OpenCV/html/.doctrees/doc/tutorials/video/table_of_content_video/
share/doc/OpenCV/html/.doctrees/doc/tutorials/video/table_of_content_video/table_of_content_video.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/creating_widgets/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/creating_widgets/creating_widgets.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/launching_viz/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/launching_viz/launching_viz.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/table_of_content_viz/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/transformations/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/transformations/transformations.doctree
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/widget_pose/
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/widget_pose/widget_pose.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_features2d.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_highgui.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_intelperc.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_mat.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_traincascade.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/user_guide.doctree
@ -445,6 +465,7 @@ share/doc/OpenCV/html/.doctrees/modules/core/doc/dynamic_structures.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/intro.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/old_basic_structures.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/old_xml_yaml_persistence.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/opengl_interop.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/operations_on_arrays.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/utility_and_system_functions_and_macros.doctree
share/doc/OpenCV/html/.doctrees/modules/core/doc/xml_yaml_persistence.doctree
@ -531,16 +552,19 @@ share/doc/OpenCV/html/.doctrees/modules/objdetect/doc/latent_svm.doctree
share/doc/OpenCV/html/.doctrees/modules/objdetect/doc/objdetect.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/camera_calibration_and_3D_reconstruction.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/data_structures.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/feature_detection_and_description.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/image_filtering.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/image_processing.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/introduction.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/matrix_reductions.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/ml_machine_learning.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/object_detection.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/ocl.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/operations_on_matrices.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/structures_and_utility_functions.doctree
share/doc/OpenCV/html/.doctrees/modules/ocl/doc/video_analysis.doctree
share/doc/OpenCV/html/.doctrees/modules/photo/
share/doc/OpenCV/html/.doctrees/modules/photo/doc/
share/doc/OpenCV/html/.doctrees/modules/photo/doc/denoising.doctree
@ -568,6 +592,11 @@ share/doc/OpenCV/html/.doctrees/modules/video/
share/doc/OpenCV/html/.doctrees/modules/video/doc/
share/doc/OpenCV/html/.doctrees/modules/video/doc/motion_analysis_and_object_tracking.doctree
share/doc/OpenCV/html/.doctrees/modules/video/doc/video.doctree
share/doc/OpenCV/html/.doctrees/modules/viz/
share/doc/OpenCV/html/.doctrees/modules/viz/doc/
share/doc/OpenCV/html/.doctrees/modules/viz/doc/viz.doctree
share/doc/OpenCV/html/.doctrees/modules/viz/doc/viz3d.doctree
share/doc/OpenCV/html/.doctrees/modules/viz/doc/widget.doctree
share/doc/OpenCV/html/.doctrees/platforms/
share/doc/OpenCV/html/.doctrees/platforms/android/
share/doc/OpenCV/html/.doctrees/platforms/android/java.doctree
@ -584,10 +613,10 @@ share/doc/OpenCV/html/.doctrees/platforms/android/service/doc/index.doctree
share/doc/OpenCV/html/_downloads/
share/doc/OpenCV/html/_downloads/Megamind.avi
share/doc/OpenCV/html/_downloads/Megamind_bugy.avi
share/doc/OpenCV/html/_downloads/Test.cpp
share/doc/OpenCV/html/_downloads/VID5.xml
share/doc/OpenCV/html/_downloads/acircles_pattern.png
share/doc/OpenCV/html/_downloads/camera_calibration.cpp
share/doc/OpenCV/html/_downloads/creating_widgets.cpp
share/doc/OpenCV/html/_downloads/discrete_fourier_transform.cpp
share/doc/OpenCV/html/_downloads/facerec_eigenfaces.cpp
share/doc/OpenCV/html/_downloads/facerec_fisherfaces.cpp
@ -602,13 +631,29 @@ share/doc/OpenCV/html/_downloads/imageTextN.png
share/doc/OpenCV/html/_downloads/imageTextR.png
share/doc/OpenCV/html/_downloads/in_VID5.xml
share/doc/OpenCV/html/_downloads/interoperability_with_OpenCV_1.cpp
share/doc/OpenCV/html/_downloads/introduction_windows_vs.cpp
share/doc/OpenCV/html/_downloads/launching_viz.cpp
share/doc/OpenCV/html/_downloads/mat_mask_operations.cpp
share/doc/OpenCV/html/_downloads/mat_the_basic_image_container.cpp
share/doc/OpenCV/html/_downloads/non_linear_svms.cpp
share/doc/OpenCV/html/_downloads/opencv-logo.png
share/doc/OpenCV/html/_downloads/pattern.png
share/doc/OpenCV/html/_downloads/transformations.cpp
share/doc/OpenCV/html/_downloads/video-write.cpp
share/doc/OpenCV/html/_downloads/widget_pose.cpp
share/doc/OpenCV/html/_images/
share/doc/OpenCV/html/_images/1-window-preferences.png
share/doc/OpenCV/html/_images/10-new-project-created.png
share/doc/OpenCV/html/_images/11-the-code.png
share/doc/OpenCV/html/_images/2-user-library-new.png
share/doc/OpenCV/html/_images/3-library-name.png
share/doc/OpenCV/html/_images/4-add-external-jars.png
share/doc/OpenCV/html/_images/5-native-library.png
share/doc/OpenCV/html/_images/6-external-folder.png
share/doc/OpenCV/html/_images/7-user-library-final.png
share/doc/OpenCV/html/_images/7_5-new-java-project.png
share/doc/OpenCV/html/_images/8-add-library.png
share/doc/OpenCV/html/_images/9-select-user-lib.png
share/doc/OpenCV/html/_images/AVD_create.png
share/doc/OpenCV/html/_images/AddNewPropertySheet.jpg
share/doc/OpenCV/html/_images/Adding_Images_Tutorial_Result_0.jpg
@ -850,6 +895,7 @@ share/doc/OpenCV/html/_images/a3.png
share/doc/OpenCV/html/_images/a4.png
share/doc/OpenCV/html/_images/a7.png
share/doc/OpenCV/html/_images/a9.png
share/doc/OpenCV/html/_images/adaptiveBilateralFilter.jpg
share/doc/OpenCV/html/_images/android_emulator_opencv_manager_fail.png
share/doc/OpenCV/html/_images/android_logo.png
share/doc/OpenCV/html/_images/android_package_7zip.png
@ -867,11 +913,14 @@ share/doc/OpenCV/html/_images/asymetricalPattern.jpg
share/doc/OpenCV/html/_images/at_database_small_sample_size.png
share/doc/OpenCV/html/_images/backprojectpatch.png
share/doc/OpenCV/html/_images/bayer.png
share/doc/OpenCV/html/_images/blurred.png
share/doc/OpenCV/html/_images/breakpoint.png
share/doc/OpenCV/html/_images/building.jpg
share/doc/OpenCV/html/_images/calib3d.jpg
share/doc/OpenCV/html/_images/camera_calibration.png
share/doc/OpenCV/html/_images/camera_calibration_square_chess.jpg
share/doc/OpenCV/html/_images/camera_view_point.png
share/doc/OpenCV/html/_images/clojure-logo.png
share/doc/OpenCV/html/_images/clooney_set.png
share/doc/OpenCV/html/_images/cmake_output.png
share/doc/OpenCV/html/_images/cmsdstartwindows.jpg
@ -889,10 +938,15 @@ share/doc/OpenCV/html/_images/colorscale_summer.jpg
share/doc/OpenCV/html/_images/colorscale_winter.jpg
share/doc/OpenCV/html/_images/core.jpg
share/doc/OpenCV/html/_images/cornersubpix.png
share/doc/OpenCV/html/_images/cpw1.png
share/doc/OpenCV/html/_images/cpw2.png
share/doc/OpenCV/html/_images/cpw3.png
share/doc/OpenCV/html/_images/cube_widget.png
share/doc/OpenCV/html/_images/defects.png
share/doc/OpenCV/html/_images/detection_of_planar_objects.png
share/doc/OpenCV/html/_images/dev_OCV_reference.png
share/doc/OpenCV/html/_images/discrete_fourier_transform.png
share/doc/OpenCV/html/_images/eclipse-logo.png
share/doc/OpenCV/html/_images/eclipse_10_crystal_clean.png
share/doc/OpenCV/html/_images/eclipse_11_run_as.png
share/doc/OpenCV/html/_images/eclipse_1_choose_workspace.png
@ -909,19 +963,8 @@ share/doc/OpenCV/html/_images/eclipse_cdt_cfg7.png
share/doc/OpenCV/html/_images/eclipse_cdt_cfg8.png
share/doc/OpenCV/html/_images/eclipse_cpp_logo.jpeg
share/doc/OpenCV/html/_images/eclipse_inst_adt.png
share/doc/OpenCV/html/_images/eclipse_main_class.png
share/doc/OpenCV/html/_images/eclipse_new_java_prj.png
share/doc/OpenCV/html/_images/eclipse_opencv_dependency0.png
share/doc/OpenCV/html/_images/eclipse_opencv_dependency1.png
share/doc/OpenCV/html/_images/eclipse_run.png
share/doc/OpenCV/html/_images/eclipse_user_lib.png
share/doc/OpenCV/html/_images/eclipse_user_lib2.png
share/doc/OpenCV/html/_images/eclipse_user_lib3.png
share/doc/OpenCV/html/_images/eclipse_user_lib4.png
share/doc/OpenCV/html/_images/eclipse_user_lib5.png
share/doc/OpenCV/html/_images/eclipse_user_lib6.png
share/doc/OpenCV/html/_images/eclipse_user_lib7.png
share/doc/OpenCV/html/_images/eclipse_user_lib8.png
share/doc/OpenCV/html/_images/edges_zoom.png
share/doc/OpenCV/html/_images/eigenface_reconstruction_opencv.png
share/doc/OpenCV/html/_images/eigenface_reconstruction_opencv1.png
@ -943,6 +986,8 @@ share/doc/OpenCV/html/_images/fisherface_reconstruction_opencv.png
share/doc/OpenCV/html/_images/fisherfaces_opencv.png
share/doc/OpenCV/html/_images/gccegg-65.jpg
share/doc/OpenCV/html/_images/general.jpg
share/doc/OpenCV/html/_images/global_view_point.png
share/doc/OpenCV/html/_images/global_view_point1.png
share/doc/OpenCV/html/_images/gpu-basics-similarity.png
share/doc/OpenCV/html/_images/gpu.jpg
share/doc/OpenCV/html/_images/haarfeatures.png
@ -963,6 +1008,7 @@ share/doc/OpenCV/html/_images/introduction_to_svm.png
share/doc/OpenCV/html/_images/lbp.png
share/doc/OpenCV/html/_images/lbp_yale.jpg
share/doc/OpenCV/html/_images/lena.png
share/doc/OpenCV/html/_images/lena1.png
share/doc/OpenCV/html/_images/linking_opencv_ios.png
share/doc/OpenCV/html/_images/matMaskFilter2DOp.png
share/doc/OpenCV/html/_images/matTheBasicImageStructure.jpg
@ -987,6 +1033,8 @@ share/doc/OpenCV/html/_images/pointpolygon.png
share/doc/OpenCV/html/_images/qtDownloadThisPackage.png
share/doc/OpenCV/html/_images/qtgui.png
share/doc/OpenCV/html/_images/quadedge.png
share/doc/OpenCV/html/_images/red_triangle.png
share/doc/OpenCV/html/_images/red_triangle1.png
share/doc/OpenCV/html/_images/result.png
share/doc/OpenCV/html/_images/result1.png
share/doc/OpenCV/html/_images/resultMatMaskFilter2D.png
@ -1036,7 +1084,11 @@ share/doc/OpenCV/html/_images/viewer_context_menu.png
share/doc/OpenCV/html/_images/visual-studio-2010-logo.jpg
share/doc/OpenCV/html/_images/visual_studio_image_watch.png
share/doc/OpenCV/html/_images/visualstudiocommandprompt.jpg
share/doc/OpenCV/html/_images/viz.jpg
share/doc/OpenCV/html/_images/vs_locals.png
share/doc/OpenCV/html/_images/widgetpose.png
share/doc/OpenCV/html/_images/window_demo.png
share/doc/OpenCV/html/_images/window_demo1.png
share/doc/OpenCV/html/_images/windows_logo.jpg
share/doc/OpenCV/html/_images/xcode_hello_ios_framework_drag_and_drop.png
share/doc/OpenCV/html/_images/xcode_hello_ios_frameworks_add_dependencies.png
@ -1179,6 +1231,8 @@ share/doc/OpenCV/html/_sources/doc/tutorials/introduction/android_binary_package
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/android_binary_package/O4A_SDK.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/android_binary_package/android_dev_intro.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/clojure_dev_intro/
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/crosscompilation/
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/desktop_java/
@ -1189,6 +1243,8 @@ share/doc/OpenCV/html/_sources/doc/tutorials/introduction/how_to_write_a_tutoria
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/ios_install/
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/ios_install/ios_install.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/java_eclipse/
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/java_eclipse/java_eclipse.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/linux_eclipse/
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/linux_eclipse/linux_eclipse.txt
share/doc/OpenCV/html/_sources/doc/tutorials/introduction/linux_gcc_cmake/
@ -1230,9 +1286,21 @@ share/doc/OpenCV/html/_sources/doc/tutorials/tutorials.txt
share/doc/OpenCV/html/_sources/doc/tutorials/video/
share/doc/OpenCV/html/_sources/doc/tutorials/video/table_of_content_video/
share/doc/OpenCV/html/_sources/doc/tutorials/video/table_of_content_video/table_of_content_video.txt
share/doc/OpenCV/html/_sources/doc/tutorials/viz/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/creating_widgets/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/creating_widgets/creating_widgets.txt
share/doc/OpenCV/html/_sources/doc/tutorials/viz/launching_viz/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/launching_viz/launching_viz.txt
share/doc/OpenCV/html/_sources/doc/tutorials/viz/table_of_content_viz/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.txt
share/doc/OpenCV/html/_sources/doc/tutorials/viz/transformations/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/transformations/transformations.txt
share/doc/OpenCV/html/_sources/doc/tutorials/viz/widget_pose/
share/doc/OpenCV/html/_sources/doc/tutorials/viz/widget_pose/widget_pose.txt
share/doc/OpenCV/html/_sources/doc/user_guide/
share/doc/OpenCV/html/_sources/doc/user_guide/ug_features2d.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_highgui.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_intelperc.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_mat.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_traincascade.txt
share/doc/OpenCV/html/_sources/doc/user_guide/user_guide.txt
@ -1269,6 +1337,7 @@ share/doc/OpenCV/html/_sources/modules/core/doc/dynamic_structures.txt
share/doc/OpenCV/html/_sources/modules/core/doc/intro.txt
share/doc/OpenCV/html/_sources/modules/core/doc/old_basic_structures.txt
share/doc/OpenCV/html/_sources/modules/core/doc/old_xml_yaml_persistence.txt
share/doc/OpenCV/html/_sources/modules/core/doc/opengl_interop.txt
share/doc/OpenCV/html/_sources/modules/core/doc/operations_on_arrays.txt
share/doc/OpenCV/html/_sources/modules/core/doc/utility_and_system_functions_and_macros.txt
share/doc/OpenCV/html/_sources/modules/core/doc/xml_yaml_persistence.txt
@ -1355,16 +1424,19 @@ share/doc/OpenCV/html/_sources/modules/objdetect/doc/latent_svm.txt
share/doc/OpenCV/html/_sources/modules/objdetect/doc/objdetect.txt
share/doc/OpenCV/html/_sources/modules/ocl/
share/doc/OpenCV/html/_sources/modules/ocl/doc/
share/doc/OpenCV/html/_sources/modules/ocl/doc/camera_calibration_and_3D_reconstruction.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/data_structures.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/feature_detection_and_description.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/image_filtering.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/image_processing.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/introduction.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/matrix_reductions.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/ml_machine_learning.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/object_detection.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/ocl.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/operations_on_matrices.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/structures_and_utility_functions.txt
share/doc/OpenCV/html/_sources/modules/ocl/doc/video_analysis.txt
share/doc/OpenCV/html/_sources/modules/photo/
share/doc/OpenCV/html/_sources/modules/photo/doc/
share/doc/OpenCV/html/_sources/modules/photo/doc/denoising.txt
@ -1392,6 +1464,11 @@ share/doc/OpenCV/html/_sources/modules/video/
share/doc/OpenCV/html/_sources/modules/video/doc/
share/doc/OpenCV/html/_sources/modules/video/doc/motion_analysis_and_object_tracking.txt
share/doc/OpenCV/html/_sources/modules/video/doc/video.txt
share/doc/OpenCV/html/_sources/modules/viz/
share/doc/OpenCV/html/_sources/modules/viz/doc/
share/doc/OpenCV/html/_sources/modules/viz/doc/viz.txt
share/doc/OpenCV/html/_sources/modules/viz/doc/viz3d.txt
share/doc/OpenCV/html/_sources/modules/viz/doc/widget.txt
share/doc/OpenCV/html/_sources/platforms/
share/doc/OpenCV/html/_sources/platforms/android/
share/doc/OpenCV/html/_sources/platforms/android/java.txt
@ -1564,6 +1641,8 @@ share/doc/OpenCV/html/doc/tutorials/introduction/android_binary_package/
share/doc/OpenCV/html/doc/tutorials/introduction/android_binary_package/O4A_SDK.html
share/doc/OpenCV/html/doc/tutorials/introduction/android_binary_package/android_dev_intro.html
share/doc/OpenCV/html/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.html
share/doc/OpenCV/html/doc/tutorials/introduction/clojure_dev_intro/
share/doc/OpenCV/html/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.html
share/doc/OpenCV/html/doc/tutorials/introduction/crosscompilation/
share/doc/OpenCV/html/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.html
share/doc/OpenCV/html/doc/tutorials/introduction/desktop_java/
@ -1574,6 +1653,8 @@ share/doc/OpenCV/html/doc/tutorials/introduction/how_to_write_a_tutorial/
share/doc/OpenCV/html/doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.html
share/doc/OpenCV/html/doc/tutorials/introduction/ios_install/
share/doc/OpenCV/html/doc/tutorials/introduction/ios_install/ios_install.html
share/doc/OpenCV/html/doc/tutorials/introduction/java_eclipse/
share/doc/OpenCV/html/doc/tutorials/introduction/java_eclipse/java_eclipse.html
share/doc/OpenCV/html/doc/tutorials/introduction/linux_eclipse/
share/doc/OpenCV/html/doc/tutorials/introduction/linux_eclipse/linux_eclipse.html
share/doc/OpenCV/html/doc/tutorials/introduction/linux_gcc_cmake/
@ -1615,9 +1696,21 @@ share/doc/OpenCV/html/doc/tutorials/tutorials.html
share/doc/OpenCV/html/doc/tutorials/video/
share/doc/OpenCV/html/doc/tutorials/video/table_of_content_video/
share/doc/OpenCV/html/doc/tutorials/video/table_of_content_video/table_of_content_video.html
share/doc/OpenCV/html/doc/tutorials/viz/
share/doc/OpenCV/html/doc/tutorials/viz/creating_widgets/
share/doc/OpenCV/html/doc/tutorials/viz/creating_widgets/creating_widgets.html
share/doc/OpenCV/html/doc/tutorials/viz/launching_viz/
share/doc/OpenCV/html/doc/tutorials/viz/launching_viz/launching_viz.html
share/doc/OpenCV/html/doc/tutorials/viz/table_of_content_viz/
share/doc/OpenCV/html/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.html
share/doc/OpenCV/html/doc/tutorials/viz/transformations/
share/doc/OpenCV/html/doc/tutorials/viz/transformations/transformations.html
share/doc/OpenCV/html/doc/tutorials/viz/widget_pose/
share/doc/OpenCV/html/doc/tutorials/viz/widget_pose/widget_pose.html
share/doc/OpenCV/html/doc/user_guide/
share/doc/OpenCV/html/doc/user_guide/ug_features2d.html
share/doc/OpenCV/html/doc/user_guide/ug_highgui.html
share/doc/OpenCV/html/doc/user_guide/ug_intelperc.html
share/doc/OpenCV/html/doc/user_guide/ug_mat.html
share/doc/OpenCV/html/doc/user_guide/ug_traincascade.html
share/doc/OpenCV/html/doc/user_guide/user_guide.html
@ -1655,6 +1748,7 @@ share/doc/OpenCV/html/modules/core/doc/dynamic_structures.html
share/doc/OpenCV/html/modules/core/doc/intro.html
share/doc/OpenCV/html/modules/core/doc/old_basic_structures.html
share/doc/OpenCV/html/modules/core/doc/old_xml_yaml_persistence.html
share/doc/OpenCV/html/modules/core/doc/opengl_interop.html
share/doc/OpenCV/html/modules/core/doc/operations_on_arrays.html
share/doc/OpenCV/html/modules/core/doc/utility_and_system_functions_and_macros.html
share/doc/OpenCV/html/modules/core/doc/xml_yaml_persistence.html
@ -1741,16 +1835,19 @@ share/doc/OpenCV/html/modules/objdetect/doc/latent_svm.html
share/doc/OpenCV/html/modules/objdetect/doc/objdetect.html
share/doc/OpenCV/html/modules/ocl/
share/doc/OpenCV/html/modules/ocl/doc/
share/doc/OpenCV/html/modules/ocl/doc/camera_calibration_and_3D_reconstruction.html
share/doc/OpenCV/html/modules/ocl/doc/data_structures.html
share/doc/OpenCV/html/modules/ocl/doc/feature_detection_and_description.html
share/doc/OpenCV/html/modules/ocl/doc/image_filtering.html
share/doc/OpenCV/html/modules/ocl/doc/image_processing.html
share/doc/OpenCV/html/modules/ocl/doc/introduction.html
share/doc/OpenCV/html/modules/ocl/doc/matrix_reductions.html
share/doc/OpenCV/html/modules/ocl/doc/ml_machine_learning.html
share/doc/OpenCV/html/modules/ocl/doc/object_detection.html
share/doc/OpenCV/html/modules/ocl/doc/ocl.html
share/doc/OpenCV/html/modules/ocl/doc/operations_on_matrices.html
share/doc/OpenCV/html/modules/ocl/doc/structures_and_utility_functions.html
share/doc/OpenCV/html/modules/ocl/doc/video_analysis.html
share/doc/OpenCV/html/modules/photo/
share/doc/OpenCV/html/modules/photo/doc/
share/doc/OpenCV/html/modules/photo/doc/denoising.html
@ -1778,6 +1875,11 @@ share/doc/OpenCV/html/modules/video/
share/doc/OpenCV/html/modules/video/doc/
share/doc/OpenCV/html/modules/video/doc/motion_analysis_and_object_tracking.html
share/doc/OpenCV/html/modules/video/doc/video.html
share/doc/OpenCV/html/modules/viz/
share/doc/OpenCV/html/modules/viz/doc/
share/doc/OpenCV/html/modules/viz/doc/viz.html
share/doc/OpenCV/html/modules/viz/doc/viz3d.html
share/doc/OpenCV/html/modules/viz/doc/widget.html
share/doc/OpenCV/html/objects.inv
share/doc/OpenCV/html/platforms/
share/doc/OpenCV/html/platforms/android/
@ -1794,7 +1896,6 @@ share/doc/OpenCV/html/platforms/android/service/doc/UseCases.html
share/doc/OpenCV/html/platforms/android/service/doc/index.html
share/doc/OpenCV/html/search.html
share/doc/OpenCV/html/searchindex.js
share/doc/OpenCV/license.txt
share/doc/OpenCV/opencv-logo-white.png
share/doc/OpenCV/opencv-logo.png
share/doc/OpenCV/opencv-logo2.png

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.1 2013/10/21 22:46:29 zhuk Exp $
@comment $OpenBSD: PLIST-java,v 1.2 2014/06/03 20:41:36 zhuk Exp $
lib/OpenCV/
lib/OpenCV/java/
lib/OpenCV/java/libopencv_java246.so
lib/OpenCV/java/opencv-246.jar
lib/OpenCV/java/libopencv_java249.so
lib/OpenCV/java/opencv-249.jar

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2013/10/21 22:46:29 zhuk Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2014/06/03 20:41:36 zhuk Exp $
@bin bin/opencv_createsamples
@bin bin/opencv_haartraining
@bin bin/opencv_performance
@ -25,6 +25,7 @@ include/opencv2/contrib/hybridtracker.hpp
include/opencv2/contrib/openfabmap.hpp
include/opencv2/contrib/retina.hpp
include/opencv2/core/
include/opencv2/core/affine.hpp
include/opencv2/core/core.hpp
include/opencv2/core/core_c.h
include/opencv2/core/cuda_devptrs.hpp
@ -139,6 +140,9 @@ include/opencv2/nonfree/nonfree.hpp
include/opencv2/nonfree/ocl.hpp
include/opencv2/objdetect/
include/opencv2/objdetect/objdetect.hpp
include/opencv2/ocl/
include/opencv2/ocl/matrix_operations.hpp
include/opencv2/ocl/ocl.hpp
include/opencv2/opencv.hpp
include/opencv2/opencv_modules.hpp
include/opencv2/photo/
@ -196,6 +200,7 @@ include/opencv2/videostab/videostab.hpp
@lib lib/libopencv_ml.so.${LIBopencv_ml_VERSION}
@lib lib/libopencv_nonfree.so.${LIBopencv_nonfree_VERSION}
@lib lib/libopencv_objdetect.so.${LIBopencv_objdetect_VERSION}
@lib lib/libopencv_ocl.so.${LIBopencv_ocl_VERSION}
@lib lib/libopencv_photo.so.${LIBopencv_photo_VERSION}
@lib lib/libopencv_stitching.so.${LIBopencv_stitching_VERSION}
@lib lib/libopencv_superres.so.${LIBopencv_superres_VERSION}
@ -209,6 +214,8 @@ lib/python${MODPY_VERSION}/site-packages/cv2.so
share/OpenCV/
share/OpenCV/OpenCVConfig-version.cmake
share/OpenCV/OpenCVConfig.cmake
share/OpenCV/OpenCVModules-release.cmake
share/OpenCV/OpenCVModules.cmake
share/OpenCV/haarcascades/
share/OpenCV/haarcascades/haarcascade_eye.xml
share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml