On Sun Dec 21, 2014 at 09:23:23PM +0100, Rafael Sadowski wrote: > Hey @ports, > > here is an update for graphics/opencv. > > - simple update to 2.4.10 > - i386 should be works (java is not more broken) > > regress pass/fail like 2.4.9 @amd64. OK? > > Regards, > > Rafael Sadowski >
I forgot to update-patches and add new patch. Next try: Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/opencv/Makefile,v retrieving revision 1.30 diff -u -p -u -p -r1.30 Makefile --- Makefile 30 Sep 2014 17:18:37 -0000 1.30 +++ Makefile 22 Dec 2014 00:30:52 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.30 2014/09/30 17:18:37 sthen Exp $ ONLY_FOR_ARCHS = ${GCC4_ARCHS} -# XXX no i386 due to often JDK build failures -ONLY_FOR_ARCHS-java = amd64 +ONLY_FOR_ARCHS-java = i386 amd64 SHARED_ONLY = Yes CATEGORIES = graphics devel @@ -10,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.9 +V = 2.4.10 DISTNAME = opencv-$V PKGNAME-main = ${PKGNAME} PKGNAME-docs = opencv-docs-$V PKGNAME-java = opencv-java-$V -REVISION-main = 1 -REVISION-docs = 0 HOMEPAGE = http://www.opencv.org/ MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/opencv/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 3 Jun 2014 20:41:36 -0000 1.3 +++ distinfo 22 Dec 2014 00:30:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (opencv-2.4.9.zip) = gDAQhIFUmI6cvaiz+oV/y7JzgsKUbtcp4afkBgC7THE= -SIZE (opencv-2.4.9.zip) = 91684751 +SHA256 (opencv-2.4.10.zip) = G/TLhyg3l/2RZp1PkLYipnepA8ILSld7eViiFk91lsY= +SIZE (opencv-2.4.10.zip) = 91692581 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/opencv/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 3 Jun 2014 20:41:36 -0000 1.4 +++ patches/patch-CMakeLists_txt 22 Dec 2014 00:30:52 -0000 @@ -1,7 +1,7 @@ $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) +--- 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) CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) if(ANDROID) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) Index: patches/patch-apps_haartraining_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/opencv/patches/patch-apps_haartraining_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-apps_haartraining_CMakeLists_txt --- patches/patch-apps_haartraining_CMakeLists_txt 19 Sep 2014 22:35:51 -0000 1.2 +++ patches/patch-apps_haartraining_CMakeLists_txt 22 Dec 2014 00:30:52 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-apps_haartraining_CMakeLists_txt,v 1.2 2014/09/19 22:35:51 zhuk Exp $ Fix linking. ---- apps/haartraining/CMakeLists.txt.orig Fri Apr 11 14:15:26 2014 -+++ apps/haartraining/CMakeLists.txt Sat Sep 20 01:51:33 2014 +--- apps/haartraining/CMakeLists.txt.orig Wed Oct 1 09:33:36 2014 ++++ apps/haartraining/CMakeLists.txt Sun Dec 21 20:16:55 2014 @@ -14,8 +14,6 @@ if(WIN32) link_directories(${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -11,7 +11,7 @@ Fix linking. # ----------------------------------------------------------- # Library # ----------------------------------------------------------- -@@ -39,6 +37,8 @@ set_target_properties(opencv_haartraining_engine PROPE +@@ -42,6 +40,8 @@ set_target_properties(opencv_haartraining_engine PROPE INSTALL_NAME_DIR lib ) @@ -20,7 +20,7 @@ Fix linking. # ----------------------------------------------------------- # haartraining # ----------------------------------------------------------- -@@ -47,6 +47,7 @@ add_executable(opencv_haartraining cvhaartraining.h ha +@@ -50,6 +50,7 @@ add_executable(opencv_haartraining cvhaartraining.h ha set_target_properties(opencv_haartraining PROPERTIES DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" OUTPUT_NAME "opencv_haartraining") @@ -28,7 +28,7 @@ Fix linking. # ----------------------------------------------------------- # createsamples -@@ -56,6 +57,7 @@ add_executable(opencv_createsamples cvhaartraining.h c +@@ -59,6 +60,7 @@ add_executable(opencv_createsamples cvhaartraining.h c set_target_properties(opencv_createsamples PROPERTIES DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" OUTPUT_NAME "opencv_createsamples") @@ -36,7 +36,7 @@ Fix linking. # ----------------------------------------------------------- # performance -@@ -64,6 +66,7 @@ add_executable(opencv_performance performance.cpp) +@@ -67,6 +69,7 @@ add_executable(opencv_performance performance.cpp) set_target_properties(opencv_performance PROPERTIES DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" OUTPUT_NAME "opencv_performance") Index: patches/patch-cmake_OpenCVFindLibsVideo_cmake =================================================================== RCS file: /cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_OpenCVFindLibsVideo_cmake --- patches/patch-cmake_OpenCVFindLibsVideo_cmake 3 Jun 2014 20:41:36 -0000 1.2 +++ patches/patch-cmake_OpenCVFindLibsVideo_cmake 22 Dec 2014 00:30:52 -0000 @@ -1,8 +1,8 @@ $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) +--- 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) + endif() endif() CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) - CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) Index: patches/patch-modules_core_include_opencv2_core_types_c_h =================================================================== RCS file: patches/patch-modules_core_include_opencv2_core_types_c_h diff -N patches/patch-modules_core_include_opencv2_core_types_c_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-modules_core_include_opencv2_core_types_c_h 22 Dec 2014 00:30:52 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +fix: conflicting declarations in tiff and opencv + +--- modules/core/include/opencv2/core/types_c.h.orig Mon Dec 22 00:15:03 2014 ++++ modules/core/include/opencv2/core/types_c.h Mon Dec 22 00:15:29 2014 +@@ -160,8 +160,16 @@ + # define CV_BIG_INT(n) n##I64 + # define CV_BIG_UINT(n) n##UI64 + #else +- typedef int64_t int64; +- typedef uint64_t uint64; ++/* Unsigned 64-bit type */ ++#ifndef __LP64__ ++ typedef long long int int64; ++ typedef long long unsigned int uint64; ++#else /* __LP64__ */ ++ typedef long int int64; ++ typedef long unsigned int uint64; ++#endif /* __LP64__ */ ++/* typedef int64_t int64; */ ++/* typedef uint64_t uint64; */ + # define CV_BIG_INT(n) n##LL + # define CV_BIG_UINT(n) n##ULL + #endif Index: pkg/PLIST-docs =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-docs,v retrieving revision 1.6 diff -u -p -u -p -r1.6 PLIST-docs --- pkg/PLIST-docs 29 Sep 2014 15:09:12 -0000 1.6 +++ pkg/PLIST-docs 22 Dec 2014 00:30:52 -0000 @@ -426,8 +426,8 @@ share/doc/OpenCV/html/.doctrees/doc/tuto 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_kinect.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 @@ -983,6 +983,7 @@ share/doc/OpenCV/html/_images/fisherface share/doc/OpenCV/html/_images/fisherface_reconstruction_0.png share/doc/OpenCV/html/_images/fisherface_reconstruction_opencv.png share/doc/OpenCV/html/_images/fisherfaces_opencv.png +share/doc/OpenCV/html/_images/fisheye_undistorted.jpg share/doc/OpenCV/html/_images/gccegg-65.jpg share/doc/OpenCV/html/_images/general.jpg share/doc/OpenCV/html/_images/global_view_point.png @@ -1298,8 +1299,8 @@ share/doc/OpenCV/html/_sources/doc/tutor 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_kinect.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 @@ -1708,8 +1709,8 @@ share/doc/OpenCV/html/doc/tutorials/viz/ 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_kinect.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 Index: pkg/PLIST-java =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST-java --- pkg/PLIST-java 3 Jun 2014 20:41:36 -0000 1.2 +++ pkg/PLIST-java 22 Dec 2014 00:30:52 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-java,v 1.2 2014/06/03 20:41:36 zhuk Exp $ lib/OpenCV/ lib/OpenCV/java/ -lib/OpenCV/java/libopencv_java249.so -lib/OpenCV/java/opencv-249.jar +lib/OpenCV/java/libopencv_java2410.so +lib/OpenCV/java/opencv-2410.jar Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST-main --- pkg/PLIST-main 3 Jun 2014 20:41:36 -0000 1.3 +++ pkg/PLIST-main 22 Dec 2014 00:30:52 -0000 @@ -214,7 +214,7 @@ 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${MODCMAKE_BUILD_SUFFIX} share/OpenCV/OpenCVModules.cmake share/OpenCV/haarcascades/ share/OpenCV/haarcascades/haarcascade_eye.xml