Re: UPDATE: graphics/opencv

[Jeff Ross]

On 8/13/21 12:46 AM, Kevin Lo wrote:

On Fri, Aug 13, 2021 at 06:40:08AM +0200, Rafael Sadowski wrote:

Update opencv to 4.5.3.

https://github.com/opencv/opencv/wiki/ChangeLog#version453

Tests are welcome, OK?

Works for me on amd64, thanks.

ok kevlo@

It builds just fine here on 6.9 release but I still get these errors 
when trying to read from a camera through OpenCV:



jross@aurora-cam:/home/jross $ export OPENCV_LOG_LEVEL=debug
jross@aurora-cam:/home/jross $ export OPENCV_VIDEOIO_DEBUG=1
jross@aurora-cam:/home/jross $ python3 skyfield_opencv_cam.py
44 Starting new skyfield_opencv_cam process...2021-08-13 
13:09:26.980582-06:00

57 now = 2021-08-13 13:09:26.980582-06:00
  tt=2459441.750800741>

Calculating for t0,t1
Calculating for t1,t2
1 2021-08-14 04:23:23.584904-06:00   Astronomical twilight
2 2021-08-14 05:09:25.517177-06:00   Nautical twilight
3 2021-08-14 05:50:28.346386-06:00   Civil twilight
4 2021-08-14 06:23:31.551642-06:00   Day
3 2021-08-14 20:36:03.619875-06:00   Civil twilight
2 2021-08-14 21:08:57.909629-06:00   Nautical twilight
1 2021-08-14 21:49:45.670362-06:00   Astronomical twilight
0 2021-08-14 22:35:21.859705-06:00   Night
86 Begin Twilight = 2021-08-13 21:51:46.061099-06:00
87 End Twilight = 2021-08-14 05:09:25.517177-06:00
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/videoio_registry.cpp 
(191) VideoBackendRegistry VIDEOIO: Builtin backends(7): FFMPEG(1000); 
GSTREAMER(990); INTEL_MFX(980); V4L_BSD(970); CV_IMAGES(960); 
CV_MJPEG(950); UEYE(940)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/videoio_registry.cpp 
(215) VideoBackendRegistry VIDEOIO: Available backends(7): FFMPEG(1000); 
GSTREAMER(990); INTEL_MFX(980); V4L_BSD(970); CV_IMAGES(960); 
CV_MJPEG(950); UEYE(940)
[ INFO:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/videoio_registry.cpp 
(217) VideoBackendRegistry VIDEOIO: Enabled backends(7, sorted by 
priority): FFMPEG(1000); GSTREAMER(990); INTEL_MFX(980); V4L_BSD(970); 
CV_IMAGES(960); CV_MJPEG(950); UEYE(940)
[ WARN:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap.cpp 
(237) open VIDEOIO(V4L_BSD): trying capture cameraNum=0 ...
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(898) open VIDEOIO(V4L2:/dev/video0): opening...
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(914) open VIDEOIO(V4L2:/dev/video0): deviceHandle=5
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_QUERYCAP(1080579584), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_QUERYCAP(1080579584), ...) => 0    errno=0 (Undefined error: 0)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_G_FMT(3234878980), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_G_FMT(3234878980), ...) => 0    errno=0 (Undefined error: 0)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_S_FMT(3234878981), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_S_FMT(3234878981), ...) => -1    errno=22 (Invalid argument)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_S_FMT(3234878981), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_S_FMT(3234878981), ...) => -1    errno=22 (Invalid argument)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_S_FMT(3234878981), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_S_FMT(3234878981), ...) => -1    errno=22 (Invalid argument)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(958) tryIoctl VIDEOIO(V4L2:/dev/video0): tryIoctl(5, 
VIDIOC_S_FMT(3234878981), failIfBusy=1)
[DEBUG:0] global 
/usr/ports/pobj/opencv-4.5.3/opencv-4.5.3/modules/videoio/src/cap_v4l.cpp 
(967) tryIoctl VIDEOIO(V4L2:/dev/video0): call ioctl(5, 
VIDIOC_S_FMT(3234878981), ...) => -1    errno=22 (Invalid argument)
[DEBUG:0] global 

Re: UPDATE: graphics/opencv

[Kevin Lo]

On Fri, Aug 13, 2021 at 06:40:08AM +0200, Rafael Sadowski wrote:
> 
> Update opencv to 4.5.3.
> 
> https://github.com/opencv/opencv/wiki/ChangeLog#version453
> 
> Tests are welcome, OK?

Works for me on amd64, thanks.

ok kevlo@

UPDATE: graphics/opencv

[Rafael Sadowski]

Update opencv to 4.5.3.

https://github.com/opencv/opencv/wiki/ChangeLog#version453

Tests are welcome, OK?

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile10 Aug 2021 06:37:05 -  1.72
+++ Makefile11 Aug 2021 08:40:18 -
@@ -6,15 +6,13 @@ CATEGORIES =  graphics devel
 COMMENT-main = library for computer vision real-time processing
 COMMENT-java = Java bindings for OpenCV
 
-V =4.5.2
+V =4.5.3
 GH_ACCOUNT =   opencv
 GH_PROJECT =   opencv
 GH_TAGNAME =   ${V}
 
 PKGNAME-main = opencv-${V}
 PKGNAME-java = opencv-java-${V}
-REVISION-java =1
-REVISION-main =1
 
 HOMEPAGE = https://www.opencv.org/
 
@@ -24,7 +22,7 @@ MAINTAINER =  Rafael Sadowski 

UPDATE: graphics/opencv

[Rafael Sadowski]

Update opencv to 4.2.0. Both consumer digikam and nomacs need small
tweaks, included in the diff below.

Nothing special in the diff below, just some cmake renames like off to
OFF and so one.

Tested on amd64 without any issues.

OK, comments?

Index: graphics/opencv/Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- graphics/opencv/Makefile10 Nov 2019 15:32:55 -  1.54
+++ graphics/opencv/Makefile13 Jan 2020 19:44:36 -
@@ -7,17 +7,14 @@ CATEGORIES =  graphics devel
 COMMENT-main = library for computer vision real-time processin
 COMMENT-java = Java bindings for OpenCV
 
-V =3.4.7
-GH_ACCOUNT =   opencv
-GH_PROJECT =   opencv
-GH_TAGNAME =   ${V}
+V =4.2.0
+GH_ACCOUNT =   opencv
+GH_PROJECT =   opencv
+GH_TAGNAME =   ${V}
 
 PKGNAME-main = opencv-${V}
 PKGNAME-java = opencv-java-${V}
 
-REVISION-main =1
-REVISION-java =0
-
 HOMEPAGE = https://www.opencv.org/
 
 MAINTAINER =   Rafael Sadowski 
@@ -25,11 +22,10 @@ MAINTAINER =Rafael Sadowski & 
gammaTable);
+   static void gammaToLinear(cv::Mat& img);
+   static void linearToGamma(cv::Mat& img);
+-  static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f 
center, double scaleLog, double angle, double scale = 1.0);
++  static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d 
center, double scaleLog, double angle, double scale = 1.0);
+   static void tinyPlanet(QImage& img, double scaleLog, double angle, 
QSize s, bool invert = false);
+ #endif
+ 

Re: UPDATE: graphics/opencv

[Jeremie Courreges-Anglas]

On Mon, Jul 01 2019, Jeremie Courreges-Anglas  wrote:
> Hi Rafael,
>
> On Mon, Mar 11 2019, Rafael Sadowski  wrote:
>> Update opencv to 3.4.2.
>>
>> Tested with upcoming nomacs update and digikam.
>>
>> Face detection and recognition works quite well with this version and
>> upcoming digikam5.
>
> Was there a reason for this change
>
>> -MODULES =   devel/cmake \
>> +MODULES =   lang/clang \
>> +devel/cmake \
>>  lang/python
>
> when
>
>   COMPILER =  base-clang ports-gcc base-gcc
>
> ?
>
> I see that there's some code in opencv  that #includes :
>
>   ./3rdparty/ittnotify/include/llvm_jit_event_listener.hpp
>
> but it doesn't appear to be built nor shipped.
>
> If there's indeed no reason to use the clang module then I'd suggest the
> patch below (build ongoing).  No bump needed since only BUILD_DEPENDS
> change.

FLAVOR='no_docs no_java' packages fine.  Unless you know about a hidden
dep... ok?


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile11 Jun 2019 00:38:35 -  1.49
+++ Makefile1 Jul 2019 10:33:04 -
@@ -41,7 +41,7 @@ WANTLIB-java += opencv_videoio
 
 WANTLIB-docs =
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
 EXTRACT_SUFX = .zip
@@ -55,8 +55,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 .include 
 
-MODULES =  lang/clang \
-   devel/cmake \
+MODULES =  devel/cmake \
lang/python
 
 BUILD_DEPENDS =devel/doxygen \


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: graphics/opencv

[Jeremie Courreges-Anglas]

Hi Rafael,

On Mon, Mar 11 2019, Rafael Sadowski  wrote:
> Update opencv to 3.4.2.
>
> Tested with upcoming nomacs update and digikam.
>
> Face detection and recognition works quite well with this version and
> upcoming digikam5.

Was there a reason for this change

> -MODULES =devel/cmake \
> +MODULES =lang/clang \
> + devel/cmake \
>   lang/python

when

  COMPILER =base-clang ports-gcc base-gcc

?

I see that there's some code in opencv  that #includes :

  ./3rdparty/ittnotify/include/llvm_jit_event_listener.hpp

but it doesn't appear to be built nor shipped.

If there's indeed no reason to use the clang module then I'd suggest the
patch below (build ongoing).  No bump needed since only BUILD_DEPENDS
change.


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile11 Jun 2019 00:38:35 -  1.49
+++ Makefile1 Jul 2019 10:33:04 -
@@ -41,7 +41,7 @@ WANTLIB-java += opencv_videoio
 
 WANTLIB-docs =
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
 EXTRACT_SUFX = .zip
@@ -55,8 +55,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 .include 
 
-MODULES =  lang/clang \
-   devel/cmake \
+MODULES =  devel/cmake \
lang/python
 
 BUILD_DEPENDS =devel/doxygen \



-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Mon Mar 11, 2019 at 09:31:56PM +0100, Rafael Sadowski wrote:
> Update opencv to 3.4.2.
> 
> Tested with upcoming nomacs update and digikam.
> 
> Face detection and recognition works quite well with this version and
> upcoming digikam5.
> 
> RS
> 

General note, to build opencv local. Please make sure you don't have
opencv installed. First run "pkg_delete opencv"

RS

Re: UPDATE: graphics/opencv 3.4.5

[Rafael Sadowski]

On Sun Dec 30, 2018 at 03:30:00PM +0100, Raphael Graf wrote:
> Hi
> 
> Attached is an update to OpenCV 3.4.5, based on the version in openbsd-wip.
> 
> It works surprisingly well, on amd64.
> 
> The extra modules from https://github.com/opencv/opencv_extra are not
> included.
> 
> I'm not sure about the tests, 500MB of testdata needs to be downloaded,
> this seems a bit excessive.. (see attached test.log)

After some tweaks Raphael Graf pushed the last version to openbsd-wip[1].
This version looks really really good and works quite well for me. Thanks
Raphael for your work!

BUT we need to port opencv_contrib[2], more specifically: libface.  We
need libface to update x11/kde-applications/libkface and
graphics/digikam-kde4.

I would prefer to build all in opencv. I already stared with some
bits[3] but I need time or more eyes and hands.

Have a good New Year!

[1]: https://github.com/jasperla/openbsd-wip/tree/master/graphics/opencv
[2]: https://github.com/opencv/opencv_contrib
[3]: 
https://github.com/jasperla/openbsd-wip/commit/f9e6ce4547a6ce5e1236bc5081658eec4c0551f0

UPDATE: graphics/opencv

[Rafael Sadowski]

Hi All,

Update OpenCV to the latest stable version 2.4.13.4.

Notable port changes:
- HOMEPAGE switch to https
- MAINTAINER email address
- Regen WANTLIB-main
- More portable cmake changes in patch-modules_java_CMakeLists_txt

Ok? Comments?

Best regards,

Rafael


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile26 Jul 2017 22:45:24 -  1.42
+++ Makefile29 Oct 2017 20:58:07 -
@@ -7,7 +7,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.13
+V =2.4.13.4
 GH_ACCOUNT =   Itseez
 GH_PROJECT =   opencv
 GH_TAGNAME =   ${V}
@@ -15,19 +15,16 @@ GH_TAGNAME =${V}
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-docs =0
-REVISION-java =0
-REVISION-main =0
 
 .for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
   opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
   opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \
   opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl
-SHARED_LIBS += $i 2.0
+SHARED_LIBS += $i 3.0
 .endfor
 
-HOMEPAGE = http://www.opencv.org/
-MAINTAINER =   Rafael Sadowski 
+HOMEPAGE = https://www.opencv.org/
+MAINTAINER =   Rafael Sadowski 
 
 # "patents" means containing some patented algorithms, see
 # http://docs.opencv.org/modules/nonfree/doc/nonfree.html
@@ -39,14 +36,15 @@ PERMIT_PACKAGE_CDROM =  patents
 PERMIT_PACKAGE_CDROM-docs =Yes
 
 WANTLIB-main += ${MODPY_WANTLIB}
-WANTLIB-main += Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
-WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
-WANTLIB-main += avcodec avformat avresample avutil bz2 c cairo fontconfig
+WANTLIB-main += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
+WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-main += Xrandr Xrender atk-1.0 avresample c cairo fontconfig
 WANTLIB-main += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB-main += gobject-2.0 gstapp-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
 WANTLIB-main += gstriff-1.0 gstvideo-1.0 gthread-2.0 gtk-x11-2.0 intl
 WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-main += png pthread ${COMPILER_LIBCXX} swscale tiff z
+WANTLIB-main += png tiff z
+
 
 WANTLIB-docs =
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo29 Nov 2016 00:27:23 -  1.6
+++ distinfo29 Oct 2017 20:58:07 -
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.13.tar.gz) = lOvMphwwA01fsW/quOwSyKho9RYtIKnwOW8PX22Lu/8=
-SIZE (opencv-2.4.13.tar.gz) = 91669572
+SHA256 (opencv-2.4.13.4.tar.gz) = +Kvx/MLaO7HerId28HuDkPhxNy4qRNw1XHZd03kZRIE=
+SIZE (opencv-2.4.13.4.tar.gz) = 91833056
Index: patches/patch-cmake_OpenCVDetectPython_cmake
===
RCS file: patches/patch-cmake_OpenCVDetectPython_cmake
diff -N patches/patch-cmake_OpenCVDetectPython_cmake
--- patches/patch-cmake_OpenCVDetectPython_cmake29 Nov 2016 00:27:23 
-  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_OpenCVDetectPython_cmake,v 1.2 2016/11/29 00:27:23 sthen 
Exp $
 cmake/OpenCVDetectPython.cmake.origWed Apr 20 16:21:19 2016
-+++ cmake/OpenCVDetectPython.cmake Mon Jun  6 23:06:38 2016
-@@ -123,8 +123,8 @@ if(PYTHON_EXECUTABLE)
- find_host_program(SPHINX_BUILD sphinx-build)
- if(SPHINX_BUILD)
- execute_process(COMMAND "${SPHINX_BUILD}"
--OUTPUT_QUIET
--ERROR_VARIABLE SPHINX_OUTPUT
-+OUTPUT_VARIABLE SPHINX_OUTPUT
-+ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
-   set(SPHINX_VERSION "${CMAKE_MATCH_1}")
Index: patches/patch-cmake_OpenCVPCHSupport_cmake
===
RCS file: 
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_OpenCVPCHSupport_cmake
--- patches/patch-cmake_OpenCVPCHSupport_cmake  21 Oct 2013 22:46:27 -  
1.1
+++ patches/patch-cmake_OpenCVPCHSupport_cmake  29 Oct 2017 20:58:07 -
@@ -1,12 +1,17 @@
 $OpenBSD: 

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Tue Nov 01, 2016 at 08:33:59PM +, Stuart Henderson wrote:
> On 2016/11/01 19:01, Rafael Sadowski wrote:
> > I do not want to give up. Maybe someone in the Budapest hackroom ;)
> 
> I'm not there but I'll have a look.

Thank you very much.

Sorry for my late answer but I have tested everything in detail and the
regression test takes about 10-16 hours. I agree in all points.

That's okay for me.

Rafael

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile  15 Apr 2016 08:53:49 -  1.37
> +++ Makefile  1 Nov 2016 20:28:55 -
> @@ -1,83 +1,65 @@
>  # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
>  
>  ONLY_FOR_ARCHS = ${GCC4_ARCHS}
> -ONLY_FOR_ARCHS-java =amd64 i386
>  
>  CATEGORIES = graphics devel
>  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.12.3
> -DISTNAME =   opencv-$V
> +V =  2.4.13
> +GH_ACCOUNT = Itseez
> +GH_PROJECT = opencv
> +GH_TAGNAME = ${V}
> +
>  PKGNAME-main =   ${PKGNAME}
>  PKGNAME-docs =   opencv-docs-$V
>  PKGNAME-java =   opencv-java-$V
> -REVISION-docs =  0
> +
> +.for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
> +  opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
> +  opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \
> +  opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl
> +SHARED_LIBS += $i 2.0
> +.endfor
>  
>  HOMEPAGE =   http://www.opencv.org/
>  MAINTAINER = Rafael Sadowski 
>  
> -SHARED_LIBS =opencv_calib3d  1.1 #1.2
> -SHARED_LIBS +=   opencv_contrib  1.1 #1.2
> -SHARED_LIBS +=   opencv_core 1.1 #1.2
> -SHARED_LIBS +=   opencv_features2d   1.1 #1.2
> -SHARED_LIBS +=   opencv_flann1.1 #1.2
> -SHARED_LIBS +=   opencv_gpu  1.1 #1.2
> -SHARED_LIBS +=   opencv_highgui  1.1 #1.2
> -SHARED_LIBS +=   opencv_imgproc  1.1 #1.2
> -SHARED_LIBS +=   opencv_legacy   1.1 #1.2
> -SHARED_LIBS +=   opencv_ml   1.1 #1.2
> -SHARED_LIBS +=   opencv_nonfree  0.1 #0.2
> -SHARED_LIBS +=   opencv_objdetect1.1 #1.2
> -SHARED_LIBS +=   opencv_photo0.1 #0.2
> -SHARED_LIBS +=   opencv_stitching0.1 #0.2
> -SHARED_LIBS +=   opencv_superres 0.1 #0.2
> -SHARED_LIBS +=   opencv_ts   0.1 #0.2
> -SHARED_LIBS +=   opencv_video1.1 #1.2
> -SHARED_LIBS +=   opencv_videostab0.1 #0.2
> -SHARED_LIBS +=   opencv_ocl  0.1 #2.5
> -
> -GH_ACCOUNT = Itseez
> -GH_PROJECT = opencv
> -GH_COMMIT =  8e40becab12c642e7bbafb9fe87698e8b6bf28da
> +# "patents" means containing some patented algorithms, see
> +# http://docs.opencv.org/modules/nonfree/doc/nonfree.html
> +# As some source modules include this functionality, we couldn't
> +# just subpackage "nonfree". Excluding this, here we have a usual
> +# BSD license.
> +PERMIT_PACKAGE_FTP = Yes
> +PERMIT_PACKAGE_CDROM =   patents
> +PERMIT_PACKAGE_CDROM-docs =  Yes
>  
> -WANTLIB-main =  Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
> +WANTLIB-main += ${MODPY_WANTLIB}
> +WANTLIB-main += Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
>  WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> -WANTLIB-main += avcodec avformat avutil bz2 c cairo fontconfig
> +WANTLIB-main += avcodec avformat avresample avutil bz2 c cairo fontconfig
>  WANTLIB-main += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> -WANTLIB-main += gobject-2.0 gstapp-1.0 gstbase-1.0 gstpbutils-1.0
> -WANTLIB-main += gstreamer-1.0 gstriff-1.0 gstvideo-1.0 gthread-2.0 
> gtk-x11-2.0
> -WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0 avresample
> -WANTLIB-main += pangoft2-1.0 png pthread stdc++ swscale tiff xml2 z
> -WANTLIB-main += ${MODGETTEXT_WANTLIB} ${MODPY_WANTLIB}
> +WANTLIB-main += gobject-2.0 gstapp-1.0 gstbase-1.0 gstpbutils-1.0 
> gstreamer-1.0
> +WANTLIB-main += gstriff-1.0 gstvideo-1.0 gthread-2.0 gtk-x11-2.0 intl
> +WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
> +WANTLIB-main += png pthread stdc++ swscale tiff z
>  
>  

Re: UPDATE: graphics/opencv

[Stuart Henderson]

On 2016/11/01 19:01, Rafael Sadowski wrote:
> I do not want to give up. Maybe someone in the Budapest hackroom ;)

I'm not there but I'll have a look.

> > >  ONLY_FOR_ARCHS = ${GCC4_ARCHS}
> > > -ONLY_FOR_ARCHS-java =amd64 i386
> > > +ONLY_FOR_ARCHS-java =${ONLY_FOR_ARCHS}

This is redundant, setting ONLY_FOR_ARCHS sets the variable for all subpackages,
so there's no point writing "+ONLY_FOR_ARCHS-anything = ${ONLY_FOR_ARCHS}".

> > > -SHARED_LIBS =opencv_calib3d  1.1 #1.2
> > > -SHARED_LIBS +=   opencv_contrib  1.1 #1.2
> > > -SHARED_LIBS +=   opencv_core 1.1 #1.2
> > > -SHARED_LIBS +=   opencv_features2d   1.1 #1.2
> > > -SHARED_LIBS +=   opencv_flann1.1 #1.2
> > > -SHARED_LIBS +=   opencv_gpu  1.1 #1.2
> > > -SHARED_LIBS +=   opencv_highgui  1.1 #1.2
> > > -SHARED_LIBS +=   opencv_imgproc  1.1 #1.2
> > > -SHARED_LIBS +=   opencv_legacy   1.1 #1.2
> > > -SHARED_LIBS +=   opencv_ml   1.1 #1.2
> > > -SHARED_LIBS +=   opencv_nonfree  0.1 #0.2
> > > -SHARED_LIBS +=   opencv_objdetect1.1 #1.2
> > > -SHARED_LIBS +=   opencv_photo0.1 #0.2
> > > -SHARED_LIBS +=   opencv_stitching0.1 #0.2
> > > -SHARED_LIBS +=   opencv_superres 0.1 #0.2
> > > -SHARED_LIBS +=   opencv_ts   0.1 #0.2
> > > -SHARED_LIBS +=   opencv_video1.1 #1.2
> > > -SHARED_LIBS +=   opencv_videostab0.1 #0.2
> > > -SHARED_LIBS +=   opencv_ocl  0.1 #2.5
> > > +SHARED_LIBS =opencv_calib3d  1.2 #1.3
> > > +SHARED_LIBS +=   opencv_contrib  1.2 #1.3
> > > +SHARED_LIBS +=   opencv_core 1.2 #1.3
> > > +SHARED_LIBS +=   opencv_features2d   1.2 #1.3
> > > +SHARED_LIBS +=   opencv_flann1.2 #1.3
> > > +SHARED_LIBS +=   opencv_gpu  1.2 #1.3
> > > +SHARED_LIBS +=   opencv_highgui  1.2 #1.3
> > > +SHARED_LIBS +=   opencv_imgproc  1.2 #1.3
> > > +SHARED_LIBS +=   opencv_legacy   1.2 #1.3
> > > +SHARED_LIBS +=   opencv_ml   1.2 #1.3
> > > +SHARED_LIBS +=   opencv_nonfree  0.2 #0.3
> > > +SHARED_LIBS +=   opencv_objdetect1.2 #1.3
> > > +SHARED_LIBS +=   opencv_photo0.2 #0.3
> > > +SHARED_LIBS +=   opencv_stitching0.2 #0.3
> > > +SHARED_LIBS +=   opencv_superres 0.2 #0.3
> > > +SHARED_LIBS +=   opencv_ts   0.2 #0.3
> > > +SHARED_LIBS +=   opencv_video1.2 #1.3
> > > +SHARED_LIBS +=   opencv_videostab0.2 #0.3
> > > +SHARED_LIBS +=   opencv_ocl  0.2 #2.6

It looks like you've just bumped the shared library minor by 1 for
everything here. That isn't how this works. Unless you're going
to properly check ABI compatibility and selectively bump where
needed, the only safe thing to do is bump major. For this port
I think you might as well just do it like this and be done with it.

.for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
  opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
  opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \
  opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl
SHARED_LIBS += $i 2.0
.endfor

> > > @@ -122,11 +119,12 @@ CONFIGURE_ARGS =-DBUILD_opencv_nonfree:
> > >   -DWITH_PNG:Bool=On \
> > >   -DWITH_TIFF:Bool=On \
> > >   -DWITH_V4L:Bool=Off \
> > > + -DENABLE_SSE3:Bool=Off \

Is this really needed on amd64? Only the first couple of generations of
64-bit-capable AMDs (2003/2004) lack SSE3, I only spot one such machine in
the current rotation of dmesglog (since Jan 2015) and the things depending
on this library in ports don't *really* look like things you'd run on such
a machine..

I'm testing this diff now (it has a bit of other cleanup too), what do
you think?

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile15 Apr 2016 08:53:49 -  1.37
+++ Makefile1 Nov 2016 20:28:55 -
@@ -1,83 +1,65 @@
 # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
 
 ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
-ONLY_FOR_ARCHS-java =  amd64 i386
 
 CATEGORIES =   graphics devel
 

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Tue Oct 04, 2016 at 08:55:55PM +0200, Rafael Sadowski wrote:
> On Mon Sep 12, 2016 at 12:20:10AM +0200, Rafael Sadowski wrote:
> > On Fri Aug 12, 2016 at 07:29:34AM +0200, Rafael Sadowski wrote:
> > > On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote:
> > > > Hi ports@,
> > > > 
> > > > update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> > > > ready for other ports in tree.
> > > > 
> > > > core ports features:
> > > > - remove XXX tags in digikam-kde4 and kde-applications.
> > > > -- Not more necessary since the last opencv update
> > > > - use OpenCVs testsuite to run tests (looks much better)
> > > > - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
> > > > 
> > > 
> > > naddy@ informed me that I forgot to update the distinfo in my last
> > > diff. Here is a new version, tested last night with -current ports tree.
> > > Thanks naddy@
> > > 
> > 
> > Updated diff number 2. without MODGETTEXT_WANTLIB. Tested amd64 with
> > current ports tree and kernel/userland. Test looks still good.
> > 
> > Kind regards,
> > 
> > Rafael
> 
> Hm, nobody?

I do not want to give up. Maybe someone in the Budapest hackroom ;)

Kind Regards,

Rafael

> 
> > 
> > 
> > Index: graphics/digikam-kde4/Makefile
> > ===
> > RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
> > retrieving revision 1.21
> > diff -u -p -u -p -r1.21 Makefile
> > --- graphics/digikam-kde4/Makefile  6 May 2016 21:39:03 -   1.21
> > +++ graphics/digikam-kde4/Makefile  11 Sep 2016 22:12:22 -
> > @@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =  X11
> >  
> >  .include 
> >  
> > -# XXX should fix OpenCV CMake config on Java-enabled archs instead!
> > -.if ${ARCH} == "amd64"
> > -BUILD_DEPENDS +=graphics/opencv,-java
> > -.endif
> > -
> >  #.if ${ARCH} == "i386"
> >  CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} 
> > -DOPENBSD_LIBKDCRAW_NO_CRASH=0"
> >  #.else
> > Index: graphics/opencv/Makefile
> > ===
> > RCS file: /cvs/ports/graphics/opencv/Makefile,v
> > retrieving revision 1.37
> > diff -u -p -u -p -r1.37 Makefile
> > --- graphics/opencv/Makefile15 Apr 2016 08:53:49 -  1.37
> > +++ graphics/opencv/Makefile11 Sep 2016 22:12:23 -
> > @@ -1,46 +1,45 @@
> >  # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
> >  
> >  ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
> > -ONLY_FOR_ARCHS-java =  amd64 i386
> > +ONLY_FOR_ARCHS-java =  ${ONLY_FOR_ARCHS}
> >  
> >  CATEGORIES =   graphics devel
> >  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.12.3
> > +V =2.4.13
> >  DISTNAME = opencv-$V
> >  PKGNAME-main = ${PKGNAME}
> >  PKGNAME-docs = opencv-docs-$V
> >  PKGNAME-java = opencv-java-$V
> > -REVISION-docs =0
> >  
> >  HOMEPAGE = http://www.opencv.org/
> >  MAINTAINER =   Rafael Sadowski 
> >  
> > -SHARED_LIBS =  opencv_calib3d  1.1 #1.2
> > -SHARED_LIBS += opencv_contrib  1.1 #1.2
> > -SHARED_LIBS += opencv_core 1.1 #1.2
> > -SHARED_LIBS += opencv_features2d   1.1 #1.2
> > -SHARED_LIBS += opencv_flann1.1 #1.2
> > -SHARED_LIBS += opencv_gpu  1.1 #1.2
> > -SHARED_LIBS += opencv_highgui  1.1 #1.2
> > -SHARED_LIBS += opencv_imgproc  1.1 #1.2
> > -SHARED_LIBS += opencv_legacy   1.1 #1.2
> > -SHARED_LIBS += opencv_ml   1.1 #1.2
> > -SHARED_LIBS += opencv_nonfree  0.1 #0.2
> > -SHARED_LIBS += opencv_objdetect1.1 #1.2
> > -SHARED_LIBS += opencv_photo0.1 #0.2
> > -SHARED_LIBS += opencv_stitching0.1 #0.2
> > -SHARED_LIBS += opencv_superres 0.1 #0.2
> > -SHARED_LIBS += opencv_ts   0.1 #0.2
> > -SHARED_LIBS += opencv_video1.1 #1.2
> > -SHARED_LIBS += opencv_videostab0.1 #0.2
> > -SHARED_LIBS += opencv_ocl  0.1 #2.5
> > +SHARED_LIBS =  opencv_calib3d  1.2 #1.3
> > +SHARED_LIBS += opencv_contrib  1.2 #1.3
> > +SHARED_LIBS += opencv_core 1.2 #1.3
> > +SHARED_LIBS += opencv_features2d   1.2 #1.3
> > +SHARED_LIBS += opencv_flann1.2 

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Mon Sep 12, 2016 at 12:20:10AM +0200, Rafael Sadowski wrote:
> On Fri Aug 12, 2016 at 07:29:34AM +0200, Rafael Sadowski wrote:
> > On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote:
> > > Hi ports@,
> > > 
> > > update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> > > ready for other ports in tree.
> > > 
> > > core ports features:
> > > - remove XXX tags in digikam-kde4 and kde-applications.
> > > -- Not more necessary since the last opencv update
> > > - use OpenCVs testsuite to run tests (looks much better)
> > > - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
> > > 
> > 
> > naddy@ informed me that I forgot to update the distinfo in my last
> > diff. Here is a new version, tested last night with -current ports tree.
> > Thanks naddy@
> > 
> 
> Updated diff number 2. without MODGETTEXT_WANTLIB. Tested amd64 with
> current ports tree and kernel/userland. Test looks still good.
> 
> Kind regards,
> 
> Rafael

Hm, nobody?

> 
> 
> Index: graphics/digikam-kde4/Makefile
> ===
> RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 Makefile
> --- graphics/digikam-kde4/Makefile6 May 2016 21:39:03 -   1.21
> +++ graphics/digikam-kde4/Makefile11 Sep 2016 22:12:22 -
> @@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =X11
>  
>  .include 
>  
> -# XXX should fix OpenCV CMake config on Java-enabled archs instead!
> -.if ${ARCH} == "amd64"
> -BUILD_DEPENDS +=graphics/opencv,-java
> -.endif
> -
>  #.if ${ARCH} == "i386"
>  CONFIGURE_ENV =  CXXFLAGS="${CXXFLAGS} 
> -DOPENBSD_LIBKDCRAW_NO_CRASH=0"
>  #.else
> Index: graphics/opencv/Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -p -r1.37 Makefile
> --- graphics/opencv/Makefile  15 Apr 2016 08:53:49 -  1.37
> +++ graphics/opencv/Makefile  11 Sep 2016 22:12:23 -
> @@ -1,46 +1,45 @@
>  # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
>  
>  ONLY_FOR_ARCHS = ${GCC4_ARCHS}
> -ONLY_FOR_ARCHS-java =amd64 i386
> +ONLY_FOR_ARCHS-java =${ONLY_FOR_ARCHS}
>  
>  CATEGORIES = graphics devel
>  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.12.3
> +V =  2.4.13
>  DISTNAME =   opencv-$V
>  PKGNAME-main =   ${PKGNAME}
>  PKGNAME-docs =   opencv-docs-$V
>  PKGNAME-java =   opencv-java-$V
> -REVISION-docs =  0
>  
>  HOMEPAGE =   http://www.opencv.org/
>  MAINTAINER = Rafael Sadowski 
>  
> -SHARED_LIBS =opencv_calib3d  1.1 #1.2
> -SHARED_LIBS +=   opencv_contrib  1.1 #1.2
> -SHARED_LIBS +=   opencv_core 1.1 #1.2
> -SHARED_LIBS +=   opencv_features2d   1.1 #1.2
> -SHARED_LIBS +=   opencv_flann1.1 #1.2
> -SHARED_LIBS +=   opencv_gpu  1.1 #1.2
> -SHARED_LIBS +=   opencv_highgui  1.1 #1.2
> -SHARED_LIBS +=   opencv_imgproc  1.1 #1.2
> -SHARED_LIBS +=   opencv_legacy   1.1 #1.2
> -SHARED_LIBS +=   opencv_ml   1.1 #1.2
> -SHARED_LIBS +=   opencv_nonfree  0.1 #0.2
> -SHARED_LIBS +=   opencv_objdetect1.1 #1.2
> -SHARED_LIBS +=   opencv_photo0.1 #0.2
> -SHARED_LIBS +=   opencv_stitching0.1 #0.2
> -SHARED_LIBS +=   opencv_superres 0.1 #0.2
> -SHARED_LIBS +=   opencv_ts   0.1 #0.2
> -SHARED_LIBS +=   opencv_video1.1 #1.2
> -SHARED_LIBS +=   opencv_videostab0.1 #0.2
> -SHARED_LIBS +=   opencv_ocl  0.1 #2.5
> +SHARED_LIBS =opencv_calib3d  1.2 #1.3
> +SHARED_LIBS +=   opencv_contrib  1.2 #1.3
> +SHARED_LIBS +=   opencv_core 1.2 #1.3
> +SHARED_LIBS +=   opencv_features2d   1.2 #1.3
> +SHARED_LIBS +=   opencv_flann1.2 #1.3
> +SHARED_LIBS +=   opencv_gpu  1.2 #1.3
> +SHARED_LIBS +=   opencv_highgui  1.2 #1.3
> +SHARED_LIBS +=   opencv_imgproc  1.2 #1.3
> +SHARED_LIBS +=   opencv_legacy   1.2 #1.3
> +SHARED_LIBS +=   

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Fri Aug 12, 2016 at 07:29:34AM +0200, Rafael Sadowski wrote:
> On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote:
> > Hi ports@,
> > 
> > update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> > ready for other ports in tree.
> > 
> > core ports features:
> > - remove XXX tags in digikam-kde4 and kde-applications.
> > -- Not more necessary since the last opencv update
> > - use OpenCVs testsuite to run tests (looks much better)
> > - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
> > 
> 
> naddy@ informed me that I forgot to update the distinfo in my last
> diff. Here is a new version, tested last night with -current ports tree.
> Thanks naddy@
> 

Updated diff number 2. without MODGETTEXT_WANTLIB. Tested amd64 with
current ports tree and kernel/userland. Test looks still good.

Kind regards,

Rafael


Index: graphics/digikam-kde4/Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- graphics/digikam-kde4/Makefile  6 May 2016 21:39:03 -   1.21
+++ graphics/digikam-kde4/Makefile  11 Sep 2016 22:12:22 -
@@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =  X11
 
 .include 
 
-# XXX should fix OpenCV CMake config on Java-enabled archs instead!
-.if ${ARCH} == "amd64"
-BUILD_DEPENDS +=graphics/opencv,-java
-.endif
-
 #.if ${ARCH} == "i386"
 CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} 
-DOPENBSD_LIBKDCRAW_NO_CRASH=0"
 #.else
Index: graphics/opencv/Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- graphics/opencv/Makefile15 Apr 2016 08:53:49 -  1.37
+++ graphics/opencv/Makefile11 Sep 2016 22:12:23 -
@@ -1,46 +1,45 @@
 # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
 
 ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
-ONLY_FOR_ARCHS-java =  amd64 i386
+ONLY_FOR_ARCHS-java =  ${ONLY_FOR_ARCHS}
 
 CATEGORIES =   graphics devel
 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.12.3
+V =2.4.13
 DISTNAME = opencv-$V
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-docs =0
 
 HOMEPAGE = http://www.opencv.org/
 MAINTAINER =   Rafael Sadowski 
 
-SHARED_LIBS =  opencv_calib3d  1.1 #1.2
-SHARED_LIBS += opencv_contrib  1.1 #1.2
-SHARED_LIBS += opencv_core 1.1 #1.2
-SHARED_LIBS += opencv_features2d   1.1 #1.2
-SHARED_LIBS += opencv_flann1.1 #1.2
-SHARED_LIBS += opencv_gpu  1.1 #1.2
-SHARED_LIBS += opencv_highgui  1.1 #1.2
-SHARED_LIBS += opencv_imgproc  1.1 #1.2
-SHARED_LIBS += opencv_legacy   1.1 #1.2
-SHARED_LIBS += opencv_ml   1.1 #1.2
-SHARED_LIBS += opencv_nonfree  0.1 #0.2
-SHARED_LIBS += opencv_objdetect1.1 #1.2
-SHARED_LIBS += opencv_photo0.1 #0.2
-SHARED_LIBS += opencv_stitching0.1 #0.2
-SHARED_LIBS += opencv_superres 0.1 #0.2
-SHARED_LIBS += opencv_ts   0.1 #0.2
-SHARED_LIBS += opencv_video1.1 #1.2
-SHARED_LIBS += opencv_videostab0.1 #0.2
-SHARED_LIBS += opencv_ocl  0.1 #2.5
+SHARED_LIBS =  opencv_calib3d  1.2 #1.3
+SHARED_LIBS += opencv_contrib  1.2 #1.3
+SHARED_LIBS += opencv_core 1.2 #1.3
+SHARED_LIBS += opencv_features2d   1.2 #1.3
+SHARED_LIBS += opencv_flann1.2 #1.3
+SHARED_LIBS += opencv_gpu  1.2 #1.3
+SHARED_LIBS += opencv_highgui  1.2 #1.3
+SHARED_LIBS += opencv_imgproc  1.2 #1.3
+SHARED_LIBS += opencv_legacy   1.2 #1.3
+SHARED_LIBS += opencv_ml   1.2 #1.3
+SHARED_LIBS += opencv_nonfree  0.2 #0.3
+SHARED_LIBS += opencv_objdetect1.2 #1.3
+SHARED_LIBS += opencv_photo0.2 #0.3
+SHARED_LIBS += opencv_stitching0.2 #0.3
+SHARED_LIBS += opencv_superres 0.2 #0.3
+SHARED_LIBS += opencv_ts   0.2 #0.3
+SHARED_LIBS += opencv_video

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote:
> Hi ports@,
> 
> update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> ready for other ports in tree.
> 
> core ports features:
> - remove XXX tags in digikam-kde4 and kde-applications.
> -- Not more necessary since the last opencv update
> - use OpenCVs testsuite to run tests (looks much better)
> - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
> 

naddy@ informed me that I forgot to update the distinfo in my last
diff. Here is a new version, tested last night with -current ports tree.
Thanks naddy@

Index: graphics/digikam-kde4/Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- graphics/digikam-kde4/Makefile  6 May 2016 21:39:03 -   1.21
+++ graphics/digikam-kde4/Makefile  11 Aug 2016 21:49:36 -
@@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =  X11
 
 .include 
 
-# XXX should fix OpenCV CMake config on Java-enabled archs instead!
-.if ${ARCH} == "amd64"
-BUILD_DEPENDS +=graphics/opencv,-java
-.endif
-
 #.if ${ARCH} == "i386"
 CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} 
-DOPENBSD_LIBKDCRAW_NO_CRASH=0"
 #.else
Index: graphics/opencv/Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- graphics/opencv/Makefile15 Apr 2016 08:53:49 -  1.37
+++ graphics/opencv/Makefile11 Aug 2016 21:49:36 -
@@ -1,46 +1,45 @@
 # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
 
 ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
-ONLY_FOR_ARCHS-java =  amd64 i386
+ONLY_FOR_ARCHS-java =  ${ONLY_FOR_ARCHS}
 
 CATEGORIES =   graphics devel
 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.12.3
+V =2.4.13
 DISTNAME = opencv-$V
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-docs =0
 
 HOMEPAGE = http://www.opencv.org/
 MAINTAINER =   Rafael Sadowski 
 
-SHARED_LIBS =  opencv_calib3d  1.1 #1.2
-SHARED_LIBS += opencv_contrib  1.1 #1.2
-SHARED_LIBS += opencv_core 1.1 #1.2
-SHARED_LIBS += opencv_features2d   1.1 #1.2
-SHARED_LIBS += opencv_flann1.1 #1.2
-SHARED_LIBS += opencv_gpu  1.1 #1.2
-SHARED_LIBS += opencv_highgui  1.1 #1.2
-SHARED_LIBS += opencv_imgproc  1.1 #1.2
-SHARED_LIBS += opencv_legacy   1.1 #1.2
-SHARED_LIBS += opencv_ml   1.1 #1.2
-SHARED_LIBS += opencv_nonfree  0.1 #0.2
-SHARED_LIBS += opencv_objdetect1.1 #1.2
-SHARED_LIBS += opencv_photo0.1 #0.2
-SHARED_LIBS += opencv_stitching0.1 #0.2
-SHARED_LIBS += opencv_superres 0.1 #0.2
-SHARED_LIBS += opencv_ts   0.1 #0.2
-SHARED_LIBS += opencv_video1.1 #1.2
-SHARED_LIBS += opencv_videostab0.1 #0.2
-SHARED_LIBS += opencv_ocl  0.1 #2.5
+SHARED_LIBS =  opencv_calib3d  1.2 #1.3
+SHARED_LIBS += opencv_contrib  1.2 #1.3
+SHARED_LIBS += opencv_core 1.2 #1.3
+SHARED_LIBS += opencv_features2d   1.2 #1.3
+SHARED_LIBS += opencv_flann1.2 #1.3
+SHARED_LIBS += opencv_gpu  1.2 #1.3
+SHARED_LIBS += opencv_highgui  1.2 #1.3
+SHARED_LIBS += opencv_imgproc  1.2 #1.3
+SHARED_LIBS += opencv_legacy   1.2 #1.3
+SHARED_LIBS += opencv_ml   1.2 #1.3
+SHARED_LIBS += opencv_nonfree  0.2 #0.3
+SHARED_LIBS += opencv_objdetect1.2 #1.3
+SHARED_LIBS += opencv_photo0.2 #0.3
+SHARED_LIBS += opencv_stitching0.2 #0.3
+SHARED_LIBS += opencv_superres 0.2 #0.3
+SHARED_LIBS += opencv_ts   0.2 #0.3
+SHARED_LIBS += opencv_video1.2 #1.3
+SHARED_LIBS += opencv_videostab0.2 #0.3
+SHARED_LIBS += opencv_ocl  0.2 #2.6
 
 GH_ACCOUNT =   Itseez
 GH_PROJECT =   opencv
-GH_COMMIT =

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

*Ping*

On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote:
> Hi ports@,
> 
> update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> ready for other ports in tree.
> 
> core ports features:
> - remove XXX tags in digikam-kde4 and kde-applications.
> -- Not more necessary since the last opencv update
> - use OpenCVs testsuite to run tests (looks much better)
> - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
> 
> Comments, Okay?!
> 
> Best regards,
> 
> Rafael
> 
> 
> Index: graphics/digikam-kde4/Makefile
> ===
> RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 Makefile
> --- graphics/digikam-kde4/Makefile6 May 2016 21:39:03 -   1.21
> +++ graphics/digikam-kde4/Makefile25 Jun 2016 18:06:01 -
> @@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =X11
>  
>  .include 
>  
> -# XXX should fix OpenCV CMake config on Java-enabled archs instead!
> -.if ${ARCH} == "amd64"
> -BUILD_DEPENDS +=graphics/opencv,-java
> -.endif
> -
>  #.if ${ARCH} == "i386"
>  CONFIGURE_ENV =  CXXFLAGS="${CXXFLAGS} 
> -DOPENBSD_LIBKDCRAW_NO_CRASH=0"
>  #.else
> Index: graphics/opencv/Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -p -r1.37 Makefile
> --- graphics/opencv/Makefile  15 Apr 2016 08:53:49 -  1.37
> +++ graphics/opencv/Makefile  25 Jun 2016 18:06:01 -
> @@ -1,46 +1,45 @@
>  # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
>  
>  ONLY_FOR_ARCHS = ${GCC4_ARCHS}
> -ONLY_FOR_ARCHS-java =amd64 i386
> +ONLY_FOR_ARCHS-java =${ONLY_FOR_ARCHS}
>  
>  CATEGORIES = graphics devel
>  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.12.3
> +V =  2.4.13
>  DISTNAME =   opencv-$V
>  PKGNAME-main =   ${PKGNAME}
>  PKGNAME-docs =   opencv-docs-$V
>  PKGNAME-java =   opencv-java-$V
> -REVISION-docs =  0
>  
>  HOMEPAGE =   http://www.opencv.org/
>  MAINTAINER = Rafael Sadowski 
>  
> -SHARED_LIBS =opencv_calib3d  1.1 #1.2
> -SHARED_LIBS +=   opencv_contrib  1.1 #1.2
> -SHARED_LIBS +=   opencv_core 1.1 #1.2
> -SHARED_LIBS +=   opencv_features2d   1.1 #1.2
> -SHARED_LIBS +=   opencv_flann1.1 #1.2
> -SHARED_LIBS +=   opencv_gpu  1.1 #1.2
> -SHARED_LIBS +=   opencv_highgui  1.1 #1.2
> -SHARED_LIBS +=   opencv_imgproc  1.1 #1.2
> -SHARED_LIBS +=   opencv_legacy   1.1 #1.2
> -SHARED_LIBS +=   opencv_ml   1.1 #1.2
> -SHARED_LIBS +=   opencv_nonfree  0.1 #0.2
> -SHARED_LIBS +=   opencv_objdetect1.1 #1.2
> -SHARED_LIBS +=   opencv_photo0.1 #0.2
> -SHARED_LIBS +=   opencv_stitching0.1 #0.2
> -SHARED_LIBS +=   opencv_superres 0.1 #0.2
> -SHARED_LIBS +=   opencv_ts   0.1 #0.2
> -SHARED_LIBS +=   opencv_video1.1 #1.2
> -SHARED_LIBS +=   opencv_videostab0.1 #0.2
> -SHARED_LIBS +=   opencv_ocl  0.1 #2.5
> +SHARED_LIBS =opencv_calib3d  1.2 #1.3
> +SHARED_LIBS +=   opencv_contrib  1.2 #1.3
> +SHARED_LIBS +=   opencv_core 1.2 #1.3
> +SHARED_LIBS +=   opencv_features2d   1.2 #1.3
> +SHARED_LIBS +=   opencv_flann1.2 #1.3
> +SHARED_LIBS +=   opencv_gpu  1.2 #1.3
> +SHARED_LIBS +=   opencv_highgui  1.2 #1.3
> +SHARED_LIBS +=   opencv_imgproc  1.2 #1.3
> +SHARED_LIBS +=   opencv_legacy   1.2 #1.3
> +SHARED_LIBS +=   opencv_ml   1.2 #1.3
> +SHARED_LIBS +=   opencv_nonfree  0.2 #0.3
> +SHARED_LIBS +=   opencv_objdetect1.2 #1.3
> +SHARED_LIBS +=   opencv_photo0.2 #0.3
> +SHARED_LIBS +=   opencv_stitching0.2 #0.3
> +SHARED_LIBS +=   opencv_superres 0.2 #0.3
> +SHARED_LIBS +=   opencv_ts   0.2 

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2016-06-25 21:07 GMT+03:00 Rafael Sadowski :
> Hi ports@,
>
> update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
> ready for other ports in tree.
>
> core ports features:
> - remove XXX tags in digikam-kde4 and kde-applications.
> -- Not more necessary since the last opencv update
> - use OpenCVs testsuite to run tests (looks much better)
> - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)
>
> Comments, Okay?!

FWIW, if someone else is interested in getting fresh OpenCV version
in, please take care of this patch: I won't be able to review anything
for 8-10 days at least, having very high load at both jobs. :(

> Index: graphics/digikam-kde4/Makefile
> ===
> RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 Makefile
> --- graphics/digikam-kde4/Makefile  6 May 2016 21:39:03 -   1.21
> +++ graphics/digikam-kde4/Makefile  25 Jun 2016 18:06:01 -
> @@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =  X11
>
>  .include 
>
> -# XXX should fix OpenCV CMake config on Java-enabled archs instead!
> -.if ${ARCH} == "amd64"
> -BUILD_DEPENDS +=graphics/opencv,-java
> -.endif
> -
>  #.if ${ARCH} == "i386"
>  CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} 
> -DOPENBSD_LIBKDCRAW_NO_CRASH=0"
>  #.else
> Index: graphics/opencv/Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -p -r1.37 Makefile
> --- graphics/opencv/Makefile15 Apr 2016 08:53:49 -  1.37
> +++ graphics/opencv/Makefile25 Jun 2016 18:06:01 -
> @@ -1,46 +1,45 @@
>  # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
>
>  ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
> -ONLY_FOR_ARCHS-java =  amd64 i386
> +ONLY_FOR_ARCHS-java =  ${ONLY_FOR_ARCHS}
>
>  CATEGORIES =   graphics devel
>  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.12.3
> +V =2.4.13
>  DISTNAME = opencv-$V
>  PKGNAME-main = ${PKGNAME}
>  PKGNAME-docs = opencv-docs-$V
>  PKGNAME-java = opencv-java-$V
> -REVISION-docs =0
>
>  HOMEPAGE = http://www.opencv.org/
>  MAINTAINER =   Rafael Sadowski 
>
> -SHARED_LIBS =  opencv_calib3d  1.1 #1.2
> -SHARED_LIBS += opencv_contrib  1.1 #1.2
> -SHARED_LIBS += opencv_core 1.1 #1.2
> -SHARED_LIBS += opencv_features2d   1.1 #1.2
> -SHARED_LIBS += opencv_flann1.1 #1.2
> -SHARED_LIBS += opencv_gpu  1.1 #1.2
> -SHARED_LIBS += opencv_highgui  1.1 #1.2
> -SHARED_LIBS += opencv_imgproc  1.1 #1.2
> -SHARED_LIBS += opencv_legacy   1.1 #1.2
> -SHARED_LIBS += opencv_ml   1.1 #1.2
> -SHARED_LIBS += opencv_nonfree  0.1 #0.2
> -SHARED_LIBS += opencv_objdetect1.1 #1.2
> -SHARED_LIBS += opencv_photo0.1 #0.2
> -SHARED_LIBS += opencv_stitching0.1 #0.2
> -SHARED_LIBS += opencv_superres 0.1 #0.2
> -SHARED_LIBS += opencv_ts   0.1 #0.2
> -SHARED_LIBS += opencv_video1.1 #1.2
> -SHARED_LIBS += opencv_videostab0.1 #0.2
> -SHARED_LIBS += opencv_ocl  0.1 #2.5
> +SHARED_LIBS =  opencv_calib3d  1.2 #1.3
> +SHARED_LIBS += opencv_contrib  1.2 #1.3
> +SHARED_LIBS += opencv_core 1.2 #1.3
> +SHARED_LIBS += opencv_features2d   1.2 #1.3
> +SHARED_LIBS += opencv_flann1.2 #1.3
> +SHARED_LIBS += opencv_gpu  1.2 #1.3
> +SHARED_LIBS += opencv_highgui  1.2 #1.3
> +SHARED_LIBS += opencv_imgproc  1.2 #1.3
> +SHARED_LIBS += opencv_legacy   1.2 #1.3
> +SHARED_LIBS += opencv_ml   1.2 #1.3
> +SHARED_LIBS += opencv_nonfree  0.2 #0.3
> +SHARED_LIBS += opencv_objdetect1.2 #1.3
> +SHARED_LIBS += opencv_photo0.2 #0.3
> +SHARED_LIBS += opencv_stitching0.2 #0.3
> +SHARED_LIBS += opencv_superres 0.2 #0.3
> +SHARED_LIBS += opencv_ts   0.2 #0.3
> +SHARED_LIBS += opencv_video1.2 #1.3
> +SHARED_LIBS 

UPDATE: graphics/opencv

[Rafael Sadowski]

Hi ports@,

update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup  is not
ready for other ports in tree.

core ports features:
- remove XXX tags in digikam-kde4 and kde-applications.
-- Not more necessary since the last opencv update
- use OpenCVs testsuite to run tests (looks much better)
- update to MODJAVA_VER 1.8 (burn in hell insecure JAVA)

Comments, Okay?!

Best regards,

Rafael


Index: graphics/digikam-kde4/Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- graphics/digikam-kde4/Makefile  6 May 2016 21:39:03 -   1.21
+++ graphics/digikam-kde4/Makefile  25 Jun 2016 18:06:01 -
@@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE =  X11
 
 .include 
 
-# XXX should fix OpenCV CMake config on Java-enabled archs instead!
-.if ${ARCH} == "amd64"
-BUILD_DEPENDS +=graphics/opencv,-java
-.endif
-
 #.if ${ARCH} == "i386"
 CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} 
-DOPENBSD_LIBKDCRAW_NO_CRASH=0"
 #.else
Index: graphics/opencv/Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- graphics/opencv/Makefile15 Apr 2016 08:53:49 -  1.37
+++ graphics/opencv/Makefile25 Jun 2016 18:06:01 -
@@ -1,46 +1,45 @@
 # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $
 
 ONLY_FOR_ARCHS =   ${GCC4_ARCHS}
-ONLY_FOR_ARCHS-java =  amd64 i386
+ONLY_FOR_ARCHS-java =  ${ONLY_FOR_ARCHS}
 
 CATEGORIES =   graphics devel
 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.12.3
+V =2.4.13
 DISTNAME = opencv-$V
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-docs =0
 
 HOMEPAGE = http://www.opencv.org/
 MAINTAINER =   Rafael Sadowski 
 
-SHARED_LIBS =  opencv_calib3d  1.1 #1.2
-SHARED_LIBS += opencv_contrib  1.1 #1.2
-SHARED_LIBS += opencv_core 1.1 #1.2
-SHARED_LIBS += opencv_features2d   1.1 #1.2
-SHARED_LIBS += opencv_flann1.1 #1.2
-SHARED_LIBS += opencv_gpu  1.1 #1.2
-SHARED_LIBS += opencv_highgui  1.1 #1.2
-SHARED_LIBS += opencv_imgproc  1.1 #1.2
-SHARED_LIBS += opencv_legacy   1.1 #1.2
-SHARED_LIBS += opencv_ml   1.1 #1.2
-SHARED_LIBS += opencv_nonfree  0.1 #0.2
-SHARED_LIBS += opencv_objdetect1.1 #1.2
-SHARED_LIBS += opencv_photo0.1 #0.2
-SHARED_LIBS += opencv_stitching0.1 #0.2
-SHARED_LIBS += opencv_superres 0.1 #0.2
-SHARED_LIBS += opencv_ts   0.1 #0.2
-SHARED_LIBS += opencv_video1.1 #1.2
-SHARED_LIBS += opencv_videostab0.1 #0.2
-SHARED_LIBS += opencv_ocl  0.1 #2.5
+SHARED_LIBS =  opencv_calib3d  1.2 #1.3
+SHARED_LIBS += opencv_contrib  1.2 #1.3
+SHARED_LIBS += opencv_core 1.2 #1.3
+SHARED_LIBS += opencv_features2d   1.2 #1.3
+SHARED_LIBS += opencv_flann1.2 #1.3
+SHARED_LIBS += opencv_gpu  1.2 #1.3
+SHARED_LIBS += opencv_highgui  1.2 #1.3
+SHARED_LIBS += opencv_imgproc  1.2 #1.3
+SHARED_LIBS += opencv_legacy   1.2 #1.3
+SHARED_LIBS += opencv_ml   1.2 #1.3
+SHARED_LIBS += opencv_nonfree  0.2 #0.3
+SHARED_LIBS += opencv_objdetect1.2 #1.3
+SHARED_LIBS += opencv_photo0.2 #0.3
+SHARED_LIBS += opencv_stitching0.2 #0.3
+SHARED_LIBS += opencv_superres 0.2 #0.3
+SHARED_LIBS += opencv_ts   0.2 #0.3
+SHARED_LIBS += opencv_video1.2 #1.3
+SHARED_LIBS += opencv_videostab0.2 #0.3
+SHARED_LIBS += opencv_ocl  0.2 #2.6
 
 GH_ACCOUNT =   Itseez
 GH_PROJECT =   opencv
-GH_COMMIT =8e40becab12c642e7bbafb9fe87698e8b6bf28da
+GH_TAGNAME =   ${V}
 
 WANTLIB-main =  Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
 WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
@@ 

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2015-11-13 10:38 GMT+03:00 Rafael Sadowski :
> On Wed Nov 11, 2015 at 02:49:09AM -0800, Vadim Zhukov wrote:
>> 2015-11-10 22:01 GMT-08:00 Rafael Sadowski :
>> > 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?

1. You need to re-run make port-lib-depends-check, too.

2. API obviously changed (see the libavresample addition in WANTLIB),
so what's with SHARED_LIBS?

--
  WBR,
  Vadim Zhukov

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Wed Nov 11, 2015 at 02:49:09AM -0800, Vadim Zhukov wrote:
> 2015-11-10 22:01 GMT-08:00 Rafael Sadowski :
> > 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
--- Makefile30 Jan 2015 21:38:37 -  1.34
+++ Makefile12 Nov 2015 23:37:20 -
@@ -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 
@@ -40,8 +38,9 @@ SHARED_LIBS +=opencv_video
1.0 #1.1
 SHARED_LIBS += opencv_videostab0.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
--- distinfo24 Jan 2015 10:56:43 -  1.4
+++ distinfo12 Nov 2015 23:37:20 -
@@ -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_txt24 Jan 2015 10:56:43 -  1.5
+++ patches/patch-CMakeLists_txt12 Nov 2015 23:37:20 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.5 2015/01/24 10:56:43 zhuk Exp $
 CMakeLists.txt.origWed Oct  1 09:33:36 2014
-+++ CMakeLists.txt Sun Dec 21 20:16:55 2014
-@@ -438,7 +438,7 @@ 

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2015-11-10 22:01 GMT-08:00 Rafael Sadowski :
> 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

UPDATE: graphics/opencv

[Rafael Sadowski]

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

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile30 Jan 2015 21:38:37 -  1.34
+++ Makefile7 Nov 2015 18:13:00 -
@@ -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 
@@ -40,8 +38,9 @@ SHARED_LIBS +=opencv_video
1.0 #1.1
 SHARED_LIBS += opencv_videostab0.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
--- distinfo24 Jan 2015 10:56:43 -  1.4
+++ distinfo7 Nov 2015 18:13:00 -
@@ -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_txt24 Jan 2015 10:56:43 -  1.5
+++ patches/patch-CMakeLists_txt7 Nov 2015 18:13:00 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.5 2015/01/24 10:56:43 zhuk Exp $
 CMakeLists.txt.origWed Oct  1 09:33:36 2014
-+++ CMakeLists.txt Sun Dec 21 20:16:55 2014
-@@ -438,7 +438,7 @@ if(UNIX)
+--- CMakeLists.txt.origMon 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 
-  1.3
+++ 

Re: UPDATE: graphics/opencv 2.4.10

[Vadim Zhukov]

2015-01-02 22:08 GMT+03:00 Vadim Zhukov persg...@gmail.com:
 02 Jan 2015, 21:44 Vadim Zhukov wrote:

 My bad, :( I'll re-check and commit soon. Thank you for reminding!

Unfortunately, this update was broken on i386 due to PIE/PIC and
inline assembly conflict. Guessing that OpenCV is used mostly
as a library, I think it's okay to have -fPIC forced. Any other
opinions before I finally put this in?

I removed the patch that fixes incompatibility in int64/uint64
definitions between OpenCV and tiff; this would break API (twice),
and is easily being workarounded, if needed.

I also added a forced version dependency for opencv-java.

So an updated patch is below.

--
WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile30 Sep 2014 17:18:37 -  1.30
+++ Makefile21 Jan 2015 08:37:38 -
@@ -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
@@ -99,7 +96,13 @@ LIB_DEPENDS-main =   ${LIB_DEPENDS} \
graphics/png \
graphics/tiff
 LIB_DEPENDS-docs =
-LIB_DEPENDS-java = ${BUILD_PKGPATH},-main
+LIB_DEPENDS-java = ${BUILD_PKGPATH},-main=${V}
+
+# PIE cannot be produced to problems with inline assembly
+.if ${ARCH:Mi386}
+CONFIGURE_ENV =CFLAGS=${CFLAGS} -fPIC \
+   CXXFLAGS=${CXXFLAGS} -fPIC
+.endif
 
 # ATM opencv requires V4L1 compat, ask them to change it,
 # then see WITH_V4L below.
Index: distinfo
===
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo3 Jun 2014 20:41:36 -   1.3
+++ distinfo21 Jan 2015 08:37:38 -
@@ -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 -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt3 Jun 2014 20:41:36 -   1.4
+++ patches/patch-CMakeLists_txt21 Jan 2015 08:37:38 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.4 2014/06/03 20:41:36 zhuk Exp $
 CMakeLists.txt.origFri Apr 11 12:15:26 2014
-+++ CMakeLists.txt Mon May 26 22:11:21 2014
-@@ -432,7 +432,7 @@ if(UNIX)
+--- CMakeLists.txt.origWed 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 -r1.2 patch-apps_haartraining_CMakeLists_txt
--- patches/patch-apps_haartraining_CMakeLists_txt  19 Sep 2014 22:35:51 
-  1.2
+++ patches/patch-apps_haartraining_CMakeLists_txt  21 Jan 2015 08:37:38 
-
@@ -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 @@ 

Re: UPDATE: graphics/opencv 2.4.10

[Vadim Zhukov]

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 -  1.30
  +++ Makefile  21 Dec 2014 19:49:22 -
  @@ -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 -   1.3
  +++ distinfo  21 Dec 2014 19:49:22 -
  @@ -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-docs29 Sep 2014 15:09:12 -  1.6
  +++ pkg/PLIST-docs21 Dec 2014 19:49:22 -
  @@ -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
  

Re: UPDATE: graphics/opencv 2.4.10

[Rafael Sadowski]

... 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?
 
 Regards,
 
 Rafael Sadowski
 
 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 -  1.30
 +++ Makefile  21 Dec 2014 19:49:22 -
 @@ -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 -   1.3
 +++ distinfo  21 Dec 2014 19:49:22 -
 @@ -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-docs29 Sep 2014 15:09:12 -  1.6
 +++ pkg/PLIST-docs21 Dec 2014 19:49:22 -
 @@ -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-java3 Jun 2014 20:41:36 -   1.2
 +++ pkg/PLIST-java21 Dec 

UPDATE: graphics/opencv 2.4.10

[Rafael Sadowski]

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

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile30 Sep 2014 17:18:37 -  1.30
+++ Makefile21 Dec 2014 19:49:22 -
@@ -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
--- distinfo3 Jun 2014 20:41:36 -   1.3
+++ distinfo21 Dec 2014 19:49:22 -
@@ -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 -  1.6
+++ pkg/PLIST-docs  21 Dec 2014 19:49:22 -
@@ -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 -   1.2
+++ pkg/PLIST-java  21 Dec 2014 19:49:22 -
@@ -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

Re: UPDATE: graphics/opencv 2.4.10

[Rafael Sadowski]

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
--- Makefile30 Sep 2014 17:18:37 -  1.30
+++ Makefile22 Dec 2014 00:30:52 -
@@ -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
--- distinfo3 Jun 2014 20:41:36 -   1.3
+++ distinfo22 Dec 2014 00:30:52 -
@@ -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_txt3 Jun 2014 20:41:36 -   1.4
+++ patches/patch-CMakeLists_txt22 Dec 2014 00:30:52 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.4 2014/06/03 20:41:36 zhuk Exp $
 CMakeLists.txt.origFri Apr 11 12:15:26 2014
-+++ CMakeLists.txt Mon May 26 22:11:21 2014
-@@ -432,7 +432,7 @@ if(UNIX)
+--- CMakeLists.txt.origWed 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 
-  1.2
+++ patches/patch-apps_haartraining_CMakeLists_txt  22 Dec 2014 00:30:52 
-
@@ -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 

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Fri Jan 03, 2014 at 04:27:35PM +0400, Vadim Zhukov wrote:
 2013/12/31 Vadim Zhukov persg...@gmail.com:
  2013/12/31 Rafael Sadowski raf...@sizeofvoid.org:
  On Tuesday 31 December 2013 01:22:13 Vadim Zhukov wrote:
  2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
   Hey @ports,
  
   maintainer update. Okay?
 
  Upstream decided to convert opencv_ts to a static library, really?
 
   cheers Rafael
 
  --
Vadim Zhukov
 
  Yes, if I can trust my build and the ArchLinux OpenCV package contents. I
  was also surprised.
 
  cheers Rafael
 
  I see the following commit upstream:
  https://github.com/Itseez/opencv/commit/131458847bbf2fe971c6b5e40a8b59d0d48b0d0c
 
  Make ts always static. This allows us to forget about the
  GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
  macros and to get rid of the dependency on cvconfig.h.
 
  As far as I can see, they bundled GTest into the opencv_ts module, and
  now are having problems when GTest is installed on the system and is
  picked up (how?! I don't see any mention of find_package(GTest) or
  such in CMakeLists.txt files... Maybe it could get linked by
  transition from some other external library, though?). Could you,
  please, try to do builds both with and without devel/gtest installed,
  and compare port-lib-depends-check output?
 
  If there will be no fallout in both builds, I think we could easily
  patch out the set(OPENCV_MODULE_TYPE STATIC) line and have opencv_ts
  in a shared library, as it should be. If something will break - it
  will mean that we have some serious problems already, with current
  port, which should get investigated.
 
 After some expirements I've got OpenCV successfully built on i386 with
 ts module as a shared library. I see no problems here, and also I
 don't see new regression tests starting to fail. The diff I've run
 with is just:
 
 --- modules/ts/CMakeLists.txt.orig  Fri Jan  3 12:54:40 2014
 +++ modules/ts/CMakeLists.txt   Fri Jan  3 13:08:59 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)
 
  if(HAVE_CUDA)
ocv_include_directories(${CUDA_INCLUDE_DIRS})
 
 Rafael, if this will be okay for you and tested on amd64 (I don't have
 PIE yet), then I'll update the port after returning from Belarus
 (January 8-9), unless someone would like to steal a commit. :)
 

Thief-commiter, please wait ;-) OpenCV 2.4.8 is out! WIP!

Cheers, Rafael

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2013/12/31 Vadim Zhukov persg...@gmail.com:
 2013/12/31 Rafael Sadowski raf...@sizeofvoid.org:
 On Tuesday 31 December 2013 01:22:13 Vadim Zhukov wrote:
 2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
  Hey @ports,
 
  maintainer update. Okay?

 Upstream decided to convert opencv_ts to a static library, really?

  cheers Rafael

 --
   Vadim Zhukov

 Yes, if I can trust my build and the ArchLinux OpenCV package contents. I
 was also surprised.

 cheers Rafael

 I see the following commit upstream:
 https://github.com/Itseez/opencv/commit/131458847bbf2fe971c6b5e40a8b59d0d48b0d0c

 Make ts always static. This allows us to forget about the
 GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
 macros and to get rid of the dependency on cvconfig.h.

 As far as I can see, they bundled GTest into the opencv_ts module, and
 now are having problems when GTest is installed on the system and is
 picked up (how?! I don't see any mention of find_package(GTest) or
 such in CMakeLists.txt files... Maybe it could get linked by
 transition from some other external library, though?). Could you,
 please, try to do builds both with and without devel/gtest installed,
 and compare port-lib-depends-check output?

 If there will be no fallout in both builds, I think we could easily
 patch out the set(OPENCV_MODULE_TYPE STATIC) line and have opencv_ts
 in a shared library, as it should be. If something will break - it
 will mean that we have some serious problems already, with current
 port, which should get investigated.

After some expirements I've got OpenCV successfully built on i386 with
ts module as a shared library. I see no problems here, and also I
don't see new regression tests starting to fail. The diff I've run
with is just:

--- modules/ts/CMakeLists.txt.orig  Fri Jan  3 12:54:40 2014
+++ modules/ts/CMakeLists.txt   Fri Jan  3 13:08:59 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)

 if(HAVE_CUDA)
   ocv_include_directories(${CUDA_INCLUDE_DIRS})

Rafael, if this will be okay for you and tested on amd64 (I don't have
PIE yet), then I'll update the port after returning from Belarus
(January 8-9), unless someone would like to steal a commit. :)

--
  WBR,
  Vadim Zhukov

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
 Hey @ports,

 maintainer update. Okay?

Upstream decided to convert opencv_ts to a static library, really?

 cheers Rafael

--
  Vadim Zhukov

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Tuesday 31 December 2013 01:22:13 Vadim Zhukov wrote:
 2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
  Hey @ports,
  
  maintainer update. Okay?
 
 Upstream decided to convert opencv_ts to a static library, really?
 
  cheers Rafael
 
 --
   Vadim Zhukov

Yes, if I can trust my build and the ArchLinux OpenCV package contents. I 
was also surprised.

cheers Rafael

Re: UPDATE: graphics/opencv

[Vadim Zhukov]

2013/12/31 Rafael Sadowski raf...@sizeofvoid.org:
 On Tuesday 31 December 2013 01:22:13 Vadim Zhukov wrote:
 2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
  Hey @ports,
 
  maintainer update. Okay?

 Upstream decided to convert opencv_ts to a static library, really?

  cheers Rafael

 --
   Vadim Zhukov

 Yes, if I can trust my build and the ArchLinux OpenCV package contents. I
 was also surprised.

 cheers Rafael

I see the following commit upstream:
https://github.com/Itseez/opencv/commit/131458847bbf2fe971c6b5e40a8b59d0d48b0d0c

Make ts always static. This allows us to forget about the
GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.

As far as I can see, they bundled GTest into the opencv_ts module, and
now are having problems when GTest is installed on the system and is
picked up (how?! I don't see any mention of find_package(GTest) or
such in CMakeLists.txt files... Maybe it could get linked by
transition from some other external library, though?). Could you,
please, try to do builds both with and without devel/gtest installed,
and compare port-lib-depends-check output?

If there will be no fallout in both builds, I think we could easily
patch out the set(OPENCV_MODULE_TYPE STATIC) line and have opencv_ts
in a shared library, as it should be. If something will break - it
will mean that we have some serious problems already, with current
port, which should get investigated.

--
  WBR,
  Vadim Zhukov

UPDATE: graphics/opencv

[Rafael Sadowski]

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
--- Makefile25 Nov 2013 14:16:23 -  1.23
+++ Makefile29 Dec 2013 21:18:14 -
@@ -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_photo0.0 #0.0
 SHARED_LIBS += opencv_stitching0.0 #0.0
 SHARED_LIBS += opencv_superres 0.0 #0.0
-SHARED_LIBS += opencv_ts   0.0 #0.0
 SHARED_LIBS += opencv_video1.0 #1.0
 SHARED_LIBS += opencv_videostab0.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
--- distinfo21 Oct 2013 22:46:27 -  1.2
+++ distinfo29 Dec 2013 21:18:14 -
@@ -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_txt21 Oct 2013 22:46:28 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origFri 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 -  1.4
+++ pkg/PLIST-docs  29 Dec 2013 21:18:14 -
@@ -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/