Hey @ports, maintainer update. Okay?
cheers Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/opencv/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile 25 Nov 2013 14:16:23 -0000 1.23 +++ Makefile 29 Dec 2013 21:18:14 -0000 @@ -10,7 +10,7 @@ COMMENT-docs = OpenCV documentation and COMMENT-main = library of programming functions for real time cv COMMENT-java = Java bindings for OpenCV -V = 2.4.6.1 +V = 2.4.7 DISTNAME = opencv-$V PKGNAME-main = ${PKGNAME} PKGNAME-docs = opencv-docs-$V @@ -34,9 +34,9 @@ SHARED_LIBS += opencv_objdetect 1.0 #1 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_ocl 0.0 #2.4 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/opencv/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 21 Oct 2013 22:46:27 -0000 1.2 +++ distinfo 29 Dec 2013 21:18:14 -0000 @@ -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.7.tar.gz) = xI1sc1v6QMdsrcwBBgUeCV2LSSsFrH0syWR76AfdKkM= +SIZE (opencv-2.4.7.tar.gz) = 85587316 Index: patches/patch-samples_ocl_CMakeLists_txt =================================================================== RCS file: patches/patch-samples_ocl_CMakeLists_txt diff -N patches/patch-samples_ocl_CMakeLists_txt --- patches/patch-samples_ocl_CMakeLists_txt 21 Oct 2013 22:46:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-samples_ocl_CMakeLists_txt,v 1.1 2013/10/21 22:46:28 zhuk Exp $ -Install OCL examples in the same place as other source modules do. ---- samples/ocl/CMakeLists.txt.orig Fri Jul 26 15:20:25 2013 -+++ samples/ocl/CMakeLists.txt Fri Jul 26 15:27:09 2013 -@@ -4,9 +4,9 @@ SET(OPENCV_OCL_SAMPLES_REQUIRED_DEPS opencv_core openc - opencv_nonfree) - - ocv_check_dependencies(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS}) -+set(project "ocl") - - if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) -- set(project "ocl") - string(TOUPPER "${project}" project_upper) - - project("${project}_samples") -@@ -54,7 +54,7 @@ endif() - if (INSTALL_C_EXAMPLES AND NOT WIN32) - file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) - install(FILES ${install_list} -- DESTINATION share/opencv/samples/${project} -+ DESTINATION share/OpenCV/samples/${project} - PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - endif() - Index: pkg/PLIST-docs =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-docs,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-docs --- pkg/PLIST-docs 21 Oct 2013 22:46:29 -0000 1.4 +++ pkg/PLIST-docs 29 Dec 2013 21:18:14 -0000 @@ -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 @@ -203,6 +203,8 @@ 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/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 @@ -364,6 +366,8 @@ share/doc/OpenCV/html/.doctrees/doc/tuto 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/ @@ -445,6 +449,7 @@ share/doc/OpenCV/html/.doctrees/modules/ 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 +536,19 @@ share/doc/OpenCV/html/.doctrees/modules/ 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 @@ -609,6 +617,18 @@ share/doc/OpenCV/html/_downloads/opencv- share/doc/OpenCV/html/_downloads/pattern.png share/doc/OpenCV/html/_downloads/video-write.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 +870,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 @@ -893,6 +914,7 @@ share/doc/OpenCV/html/_images/defects.pn 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 +931,8 @@ share/doc/OpenCV/html/_images/eclipse_cd 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 @@ -1189,6 +1200,8 @@ share/doc/OpenCV/html/_sources/doc/tutor 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/ @@ -1269,6 +1282,7 @@ share/doc/OpenCV/html/_sources/modules/c 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 +1369,19 @@ share/doc/OpenCV/html/_sources/modules/o 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 @@ -1574,6 +1591,8 @@ share/doc/OpenCV/html/doc/tutorials/intr 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/ @@ -1655,6 +1674,7 @@ share/doc/OpenCV/html/modules/core/doc/d 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 +1761,19 @@ share/doc/OpenCV/html/modules/objdetect/ 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 @@ -1794,7 +1817,6 @@ share/doc/OpenCV/html/platforms/android/ 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 Index: pkg/PLIST-java =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-java --- pkg/PLIST-java 21 Oct 2013 22:46:29 -0000 1.1 +++ pkg/PLIST-java 29 Dec 2013 21:18:14 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-java,v 1.1 2013/10/21 22:46:29 zhuk Exp $ lib/OpenCV/ lib/OpenCV/java/ -lib/OpenCV/java/libopencv_java246.so -lib/OpenCV/java/opencv-246.jar +lib/OpenCV/java/libopencv_java247.so +lib/OpenCV/java/opencv-247.jar Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- pkg/PLIST-main 21 Oct 2013 22:46:29 -0000 1.2 +++ pkg/PLIST-main 29 Dec 2013 21:18:14 -0000 @@ -139,6 +139,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/ @@ -199,7 +202,7 @@ include/opencv2/videostab/videostab.hpp @lib lib/libopencv_photo.so.${LIBopencv_photo_VERSION} @lib lib/libopencv_stitching.so.${LIBopencv_stitching_VERSION} @lib lib/libopencv_superres.so.${LIBopencv_superres_VERSION} -@lib lib/libopencv_ts.so.${LIBopencv_ts_VERSION} +lib/libopencv_ts.a @lib lib/libopencv_video.so.${LIBopencv_video_VERSION} @lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION} lib/pkgconfig/opencv.pc @@ -209,6 +212,8 @@ lib/python${MODPY_VERSION}/site-packages 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