02 янв. 2015 г. 21:44 пользователь "Rafael Sadowski" <raf...@sizeofvoid.org>
написал:
>
> ... need a hug ;-)
>
> 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?
My bad, :( I'll re-check and commit soon. Thank you for reminding!
--
Vadim Zhukov
> > 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 21 Dec 2014 19:49:22 -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 21 Dec 2014 19:49:22 -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: 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 21 Dec 2014 19:49:22 -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 21 Dec 2014 19:49:22 -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 21 Dec 2014 19:49:22 -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
>
