NetBSD Problem Report #50657

From diro@nixsyspaus.org  Thu Jan 14 20:32:39 2016
Return-Path: <diro@nixsyspaus.org>
Received: from mail.netbsd.org (mail.NetBSD.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 551B87ABC0
	for <gnats-bugs@gnats.netbsd.org>; Thu, 14 Jan 2016 20:32:39 +0000 (UTC)
Message-Id: <20160114143507.7E3DA2041E4@asche.nixsyspaus.org>
Date: Thu, 14 Jan 2016 14:35:07 +0000 (UTC)
From: rodent@NetBSD.org
Reply-To: rodent@NetBSD.org
To: gnats-bugs@gnats.netbsd.org
Subject: graphics/opencv build fails on Linux
X-Send-Pr-Version: 3.95

>Number:         50657
>Category:       pkg
>Synopsis:       graphics/opencv build fails on Linux
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    linux-pkg-people
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 14 20:35:00 +0000 2016
>Closed-Date:    Tue May 31 09:53:47 +0000 2016
>Last-Modified:  Fri Jun 03 20:15:00 +0000 2016
>Originator:     rodent@NetBSD.org
>Release:        CentOS 6.5
>Organization:
>Environment:
System: Linux yeehaw 2.6.32-431.29.2.el6.x86_64 #1 SMP Tue Sep 9 21:36:05 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
Architecture: amd64
Machine: amd64
>Description:
OpenCV build is broken on Leenox. However, upstream fixed it. We just need to
update the package.
>How-To-Repeat:
Run the build on porky penguin OS.
>Fix:

(This was tested on Linux and FreeBSD as working. You just need to ensure all
leaf packages too. The updated version of freeswitch that I'm fixing worked
with it OK.)

1) Remove: patches/patch-modules_core_src_parallel__pthreads.cpp
2) Remove: patches/patch-modules_python_common.cmake
3) Apply this patchola:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	18 Nov 2015 14:19:50 -0000	1.57
+++ Makefile	30 Dec 2015 18:16:22 -0000
@@ -1,10 +1,8 @@
 # $NetBSD: Makefile,v 1.57 2015/11/18 14:19:50 ryoon Exp $

-DISTNAME=	opencv-3.0.0
-PKGREVISION=	1
+DISTNAME=	opencv-3.1.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Itseez/}
-EXTRACT_SUFX=	.zip

 MAINTAINER=	anthony.mallet@laas.fr
 HOMEPAGE=	http://code.opencv.org/projects/OpenCV/wiki/WikiStart
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- PLIST	8 Oct 2015 17:45:59 -0000	1.15
+++ PLIST	30 Dec 2015 18:16:22 -0000
@@ -1,29 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2015/10/08 17:45:59 fhajny Exp $
+@comment $NetBSD$
 bin/opencv_annotation
 bin/opencv_createsamples
 bin/opencv_traincascade
-include/opencv/cv.h
-include/opencv/cv.hpp
-include/opencv/cvaux.h
-include/opencv/cvaux.hpp
-include/opencv/cvwimage.h
-include/opencv/cxcore.h
-include/opencv/cxcore.hpp
-include/opencv/cxeigen.hpp
-include/opencv/cxmisc.h
-include/opencv/highgui.h
-include/opencv/ml.h
-include/opencv2/calib3d.hpp
-include/opencv2/calib3d/calib3d.hpp
 include/opencv2/calib3d/calib3d_c.h
-include/opencv2/core.hpp
+include/opencv2/calib3d/calib3d.hpp
+include/opencv2/calib3d.hpp
 include/opencv2/core/affine.hpp
 include/opencv2/core/base.hpp
 include/opencv2/core/bufferpool.hpp
-include/opencv2/core/core.hpp
 include/opencv2/core/core_c.h
-include/opencv2/core/cuda.hpp
-include/opencv2/core/cuda.inl.hpp
+include/opencv2/core/core.hpp
 include/opencv2/core/cuda/block.hpp
 include/opencv2/core/cuda/border_interpolate.hpp
 include/opencv2/core/cuda/color.hpp
@@ -40,12 +26,16 @@
 include/opencv2/core/cuda/filters.hpp
 include/opencv2/core/cuda/funcattrib.hpp
 include/opencv2/core/cuda/functional.hpp
+include/opencv2/core/cuda.hpp
+include/opencv2/core/cuda.inl.hpp
 include/opencv2/core/cuda/limits.hpp
 include/opencv2/core/cuda/reduce.hpp
 include/opencv2/core/cuda/saturate_cast.hpp
 include/opencv2/core/cuda/scan.hpp
 include/opencv2/core/cuda/simd_functions.hpp
+include/opencv2/core/cuda_stream_accessor.hpp
 include/opencv2/core/cuda/transform.hpp
+include/opencv2/core/cuda_types.hpp
 include/opencv2/core/cuda/type_traits.hpp
 include/opencv2/core/cuda/utility.hpp
 include/opencv2/core/cuda/vec_distance.hpp
@@ -54,19 +44,26 @@
 include/opencv2/core/cuda/warp.hpp
 include/opencv2/core/cuda/warp_reduce.hpp
 include/opencv2/core/cuda/warp_shuffle.hpp
-include/opencv2/core/cuda_stream_accessor.hpp
-include/opencv2/core/cuda_types.hpp
 include/opencv2/core/cvdef.h
 include/opencv2/core/cvstd.hpp
 include/opencv2/core/cvstd.inl.hpp
 include/opencv2/core/directx.hpp
 include/opencv2/core/eigen.hpp
+include/opencv2/core/fast_math.hpp
+include/opencv2/core/hal/hal.hpp
+include/opencv2/core/hal/interface.h
+include/opencv2/core/hal/intrin_cpp.hpp
+include/opencv2/core/hal/intrin.hpp
+include/opencv2/core/hal/intrin_neon.hpp
+include/opencv2/core/hal/intrin_sse.hpp
+include/opencv2/core.hpp
 include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
 include/opencv2/core/mat.inl.hpp
 include/opencv2/core/matx.hpp
-include/opencv2/core/ocl.hpp
+include/opencv2/core/neon_utils.hpp
 include/opencv2/core/ocl_genbase.hpp
+include/opencv2/core/ocl.hpp
 include/opencv2/core/opengl.hpp
 include/opencv2/core/operations.hpp
 include/opencv2/core/optim.hpp
@@ -74,17 +71,18 @@
 include/opencv2/core/private.cuda.hpp
 include/opencv2/core/private.hpp
 include/opencv2/core/ptr.inl.hpp
+include/opencv2/core/saturate.hpp
 include/opencv2/core/sse_utils.hpp
 include/opencv2/core/traits.hpp
-include/opencv2/core/types.hpp
 include/opencv2/core/types_c.h
+include/opencv2/core/types.hpp
 include/opencv2/core/utility.hpp
+include/opencv2/core/va_intel.hpp
 include/opencv2/core/version.hpp
 include/opencv2/core/wimage.hpp
 include/opencv2/cvconfig.h
-include/opencv2/features2d.hpp
 include/opencv2/features2d/features2d.hpp
-include/opencv2/flann.hpp
+include/opencv2/features2d.hpp
 include/opencv2/flann/all_indices.h
 include/opencv2/flann/allocator.h
 include/opencv2/flann/any.h
@@ -95,13 +93,14 @@
 include/opencv2/flann/dist.h
 include/opencv2/flann/dummy.h
 include/opencv2/flann/dynamic_bitset.h
-include/opencv2/flann/flann.hpp
 include/opencv2/flann/flann_base.hpp
+include/opencv2/flann/flann.hpp
 include/opencv2/flann/general.h
 include/opencv2/flann/ground_truth.h
 include/opencv2/flann/hdf5.h
 include/opencv2/flann/heap.h
 include/opencv2/flann/hierarchical_clustering_index.h
+include/opencv2/flann.hpp
 include/opencv2/flann/index_testing.h
 include/opencv2/flann/kdtree_index.h
 include/opencv2/flann/kdtree_single_index.h
@@ -121,42 +120,36 @@
 include/opencv2/flann/saving.h
 include/opencv2/flann/simplex_downhill.h
 include/opencv2/flann/timer.h
-include/opencv2/hal.hpp
-include/opencv2/hal/defs.h
-include/opencv2/hal/intrin.hpp
-include/opencv2/hal/intrin_cpp.hpp
-include/opencv2/hal/intrin_neon.hpp
-include/opencv2/hal/intrin_sse.hpp
-include/opencv2/highgui.hpp
-include/opencv2/highgui/highgui.hpp
 include/opencv2/highgui/highgui_c.h
+include/opencv2/highgui/highgui.hpp
+include/opencv2/highgui.hpp
 include/opencv2/imgcodecs.hpp
-include/opencv2/imgcodecs/imgcodecs.hpp
 include/opencv2/imgcodecs/imgcodecs_c.h
+include/opencv2/imgcodecs/imgcodecs.hpp
 include/opencv2/imgcodecs/ios.h
+include/opencv2/imgproc/detail/distortion_model.hpp
 include/opencv2/imgproc.hpp
-include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/imgproc_c.h
+include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/types_c.h
 include/opencv2/ml.hpp
 include/opencv2/ml/ml.hpp
-include/opencv2/objdetect.hpp
 include/opencv2/objdetect/detection_based_tracker.hpp
-include/opencv2/objdetect/objdetect.hpp
+include/opencv2/objdetect.hpp
 include/opencv2/objdetect/objdetect_c.h
+include/opencv2/objdetect/objdetect.hpp
 include/opencv2/opencv.hpp
 include/opencv2/opencv_modules.hpp
-include/opencv2/photo.hpp
 include/opencv2/photo/cuda.hpp
-include/opencv2/photo/photo.hpp
+include/opencv2/photo.hpp
 include/opencv2/photo/photo_c.h
-include/opencv2/shape.hpp
+include/opencv2/photo/photo.hpp
 include/opencv2/shape/emdL1.hpp
 include/opencv2/shape/hist_cost.hpp
-include/opencv2/shape/shape.hpp
+include/opencv2/shape.hpp
 include/opencv2/shape/shape_distance.hpp
+include/opencv2/shape/shape.hpp
 include/opencv2/shape/shape_transformer.hpp
-include/opencv2/stitching.hpp
 include/opencv2/stitching/detail/autocalib.hpp
 include/opencv2/stitching/detail/blenders.hpp
 include/opencv2/stitching/detail/camera.hpp
@@ -169,24 +162,22 @@
 include/opencv2/stitching/detail/util_inl.hpp
 include/opencv2/stitching/detail/warpers.hpp
 include/opencv2/stitching/detail/warpers_inl.hpp
+include/opencv2/stitching.hpp
 include/opencv2/stitching/warpers.hpp
 include/opencv2/superres.hpp
 include/opencv2/superres/optical_flow.hpp
-include/opencv2/video.hpp
 include/opencv2/video/background_segm.hpp
-include/opencv2/video/tracking.hpp
-include/opencv2/video/tracking_c.h
-include/opencv2/video/video.hpp
-include/opencv2/videoio.hpp
+include/opencv2/video.hpp
 include/opencv2/videoio/cap_ios.h
-include/opencv2/videoio/videoio.hpp
+include/opencv2/videoio.hpp
 include/opencv2/videoio/videoio_c.h
-include/opencv2/videostab.hpp
+include/opencv2/videoio/videoio.hpp
 include/opencv2/videostab/deblurring.hpp
 include/opencv2/videostab/fast_marching.hpp
 include/opencv2/videostab/fast_marching_inl.hpp
 include/opencv2/videostab/frame_source.hpp
 include/opencv2/videostab/global_motion.hpp
+include/opencv2/videostab.hpp
 include/opencv2/videostab/inpainting.hpp
 include/opencv2/videostab/log.hpp
 include/opencv2/videostab/motion_core.hpp
@@ -196,69 +187,78 @@
 include/opencv2/videostab/ring_buffer.hpp
 include/opencv2/videostab/stabilizer.hpp
 include/opencv2/videostab/wobble_suppression.hpp
+include/opencv2/video/tracking_c.h
+include/opencv2/video/tracking.hpp
+include/opencv2/video/video.hpp
+include/opencv/cvaux.h
+include/opencv/cvaux.hpp
+include/opencv/cv.h
+include/opencv/cv.hpp
+include/opencv/cvwimage.h
+include/opencv/cxcore.h
+include/opencv/cxcore.hpp
+include/opencv/cxeigen.hpp
+include/opencv/cxmisc.h
+include/opencv/highgui.h
+include/opencv/ml.h
 lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.3.0
+lib/libopencv_calib3d.so.3.1
 lib/libopencv_calib3d.so.${PKGVERSION}
 lib/libopencv_core.so
-lib/libopencv_core.so.3.0
+lib/libopencv_core.so.3.1
 lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_features2d.so
-lib/libopencv_features2d.so.3.0
+lib/libopencv_features2d.so.3.1
 lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
-lib/libopencv_flann.so.3.0
+lib/libopencv_flann.so.3.1
 lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_hal.a
 lib/libopencv_highgui.so
-lib/libopencv_highgui.so.3.0
+lib/libopencv_highgui.so.3.1
 lib/libopencv_highgui.so.${PKGVERSION}
 lib/libopencv_imgcodecs.so
-lib/libopencv_imgcodecs.so.3.0
+lib/libopencv_imgcodecs.so.3.1
 lib/libopencv_imgcodecs.so.${PKGVERSION}
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.3.0
+lib/libopencv_imgproc.so.3.1
 lib/libopencv_imgproc.so.${PKGVERSION}
 lib/libopencv_ml.so
-lib/libopencv_ml.so.3.0
+lib/libopencv_ml.so.3.1
 lib/libopencv_ml.so.${PKGVERSION}
 lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.3.0
+lib/libopencv_objdetect.so.3.1
 lib/libopencv_objdetect.so.${PKGVERSION}
 lib/libopencv_photo.so
-lib/libopencv_photo.so.3.0
+lib/libopencv_photo.so.3.1
 lib/libopencv_photo.so.${PKGVERSION}
 lib/libopencv_shape.so
-lib/libopencv_shape.so.3.0
+lib/libopencv_shape.so.3.1
 lib/libopencv_shape.so.${PKGVERSION}
 lib/libopencv_stitching.so
-lib/libopencv_stitching.so.3.0
+lib/libopencv_stitching.so.3.1
 lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_superres.so
-lib/libopencv_superres.so.3.0
+lib/libopencv_superres.so.3.1
 lib/libopencv_superres.so.${PKGVERSION}
 lib/libopencv_ts.a
-lib/libopencv_video.so
-lib/libopencv_video.so.3.0
-lib/libopencv_video.so.${PKGVERSION}
 lib/libopencv_videoio.so
-lib/libopencv_videoio.so.3.0
+lib/libopencv_videoio.so.3.1
 lib/libopencv_videoio.so.${PKGVERSION}
+lib/libopencv_video.so
+lib/libopencv_video.so.3.1
+lib/libopencv_video.so.${PKGVERSION}
 lib/libopencv_videostab.so
-lib/libopencv_videostab.so.3.0
+lib/libopencv_videostab.so.3.1
 lib/libopencv_videostab.so.${PKGVERSION}
 lib/pkgconfig/opencv.pc
 ${PYSITELIB}/cv2.so
-share/OpenCV/OpenCVConfig-version.cmake
-share/OpenCV/OpenCVConfig.cmake
-share/OpenCV/OpenCVModules-release.cmake
-share/OpenCV/OpenCVModules.cmake
-share/OpenCV/haarcascades/haarcascade_eye.xml
 share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
-share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
+share/OpenCV/haarcascades/haarcascade_eye.xml
 share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
+share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
+share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
 share/OpenCV/haarcascades/haarcascade_fullbody.xml
 share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
@@ -273,3 +273,7 @@
 share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
 share/OpenCV/lbpcascades/lbpcascade_profileface.xml
 share/OpenCV/lbpcascades/lbpcascade_silverware.xml
+share/OpenCV/OpenCVConfig.cmake
+share/OpenCV/OpenCVConfig-version.cmake
+share/OpenCV/OpenCVModules.cmake
+share/OpenCV/OpenCVModules-release.cmake
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/distinfo,v
retrieving revision 1.32
diff -u -r1.32 distinfo
--- distinfo	3 Nov 2015 21:34:11 -0000	1.32
+++ distinfo	30 Dec 2015 18:16:22 -0000
@@ -1,16 +1,14 @@
 $NetBSD: distinfo,v 1.32 2015/11/03 21:34:11 agc Exp $

-SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
-RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
-SHA512 (opencv-3.0.0.zip) = 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
-Size (opencv-3.0.0.zip) = 100980799 bytes
-SHA1 (patch-3rdparty_ippicv_downloader.cmake) = 8d99b26a39aa184a4dfc03e4928ea7b7b62e71d9
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
-SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
-SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = dba43f8252eda7807379469cf9359581bf4d41ad
-SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
-SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 2f4d2f43afe370eef748e05bec199bc963e1ecab
-SHA1 (patch-modules_python_common.cmake) = d6289a316712bb8be4d590965c87f6bb3525a938
-SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
+SHA1 (opencv-3.1.0.tar.gz) = 6bbe804d2b5de17cff73a5f56aa025e8b1e7f1fd
+RMD160 (opencv-3.1.0.tar.gz) = ab07ba33f865ce379149e55f7187fcabaa19da5d
+SHA512 (opencv-3.1.0.tar.gz) = 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
+Size (opencv-3.1.0.tar.gz) = 76135587 bytes
+SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51
+SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 03572cd2f2be7290ef5dae3522e87a03aa62aa36
+SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 88f2bfc0b196584c706bcbacb723b253fddde309
+SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 0f51521d0fa8cb3049ac3f6cb13366fbae84c057
+SHA1 (patch-modules_core_src_system.cpp) = 90a77e2f2c59cb2d43bdd2c6f9b8175e1f97651a
+SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = c8af9b329a60485c2863b729f1cc9e29c1191704
+SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 83575857156321ae07f3fb03d1b3c61b804b3832
+SHA1 (patch-modules_ts_src_ts.cpp) = 2403d645ad7d3e83c76d059e3efa7826eff097a3
Index: patches/patch-3rdparty_ippicv_downloader.cmake
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake,v
retrieving revision 1.1
diff -u -r1.1 patch-3rdparty_ippicv_downloader.cmake
--- patches/patch-3rdparty_ippicv_downloader.cmake	13 Oct 2015 14:37:43 -0000	1.1
+++ patches/patch-3rdparty_ippicv_downloader.cmake	30 Dec 2015 18:16:22 -0000
@@ -1,12 +1,12 @@
 $NetBSD: patch-3rdparty_ippicv_downloader.cmake,v 1.1 2015/10/13 14:37:43 joerg Exp $

---- 3rdparty/ippicv/downloader.cmake.orig	2015-10-13 13:00:47.000000000 +0000
+--- 3rdparty/ippicv/downloader.cmake.orig	2015-12-18 15:02:16.000000000 +0000
 +++ 3rdparty/ippicv/downloader.cmake
 @@ -6,6 +6,7 @@
  #

  function(_icv_downloader)
 +  return()
+   # Commit SHA in the opencv_3rdparty repo
+   set(IPPICV_BINARIES_COMMIT "81a676001ca8075ada498583e4166079e5744668")
    # Define actual ICV versions
-   if(APPLE)
-     set(OPENCV_ICV_PACKAGE_NAME "ippicv_macosx_20141027.tgz")
Index: patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake,v
retrieving revision 1.1
diff -u -r1.1 patch-cmake_OpenCVDetectCXXCompiler.cmake
--- patches/patch-cmake_OpenCVDetectCXXCompiler.cmake	8 Oct 2015 17:45:59 -0000	1.1
+++ patches/patch-cmake_OpenCVDetectCXXCompiler.cmake	30 Dec 2015 18:16:22 -0000
@@ -2,9 +2,9 @@

 Rely on pkgsrc to set architeture, see CONFIGURE_ENV.

---- cmake/OpenCVDetectCXXCompiler.cmake.orig	2015-06-03 17:21:34.000000000 +0000
+--- cmake/OpenCVDetectCXXCompiler.cmake.orig	2015-12-18 15:02:16.000000000 +0000
 +++ cmake/OpenCVDetectCXXCompiler.cmake
-@@ -103,6 +103,10 @@ if(MSVC64 OR MINGW64)
+@@ -116,6 +116,10 @@ if(MSVC64 OR MINGW64)
    set(X86_64 1)
  elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING))
    set(X86 1)
Index: patches/patch-modules_core_include_opencv2_core_types_c.h
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h,v
retrieving revision 1.2
diff -u -r1.2 patch-modules_core_include_opencv2_core_types_c.h
--- patches/patch-modules_core_include_opencv2_core_types_c.h	8 Oct 2015 17:45:59 -0000	1.2
+++ patches/patch-modules_core_include_opencv2_core_types_c.h	30 Dec 2015 18:16:22 -0000
@@ -2,7 +2,7 @@

 Define 'depth' as unsigned int, or IPL_DEPTH_SIGN=0x8000000 won't fit in int.

---- modules/core/include/opencv2/core/types_c.h.orig	2015-06-03 17:21:34.000000000 +0000
+--- modules/core/include/opencv2/core/types_c.h.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/core/include/opencv2/core/types_c.h
 @@ -303,7 +303,7 @@ _IplImage
      int  ID;                /**< version (=0)*/
Index: patches/patch-modules_core_src_downhill__simplex.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_core_src_downhill__simplex.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-modules_core_src_downhill__simplex.cpp
--- patches/patch-modules_core_src_downhill__simplex.cpp	8 Oct 2015 17:45:59 -0000	1.1
+++ patches/patch-modules_core_src_downhill__simplex.cpp	30 Dec 2015 18:16:22 -0000
@@ -2,7 +2,7 @@

 Avoid DS conflict on SunOS.

---- modules/core/src/downhill_simplex.cpp.orig	2015-06-03 17:21:34.000000000 +0000
+--- modules/core/src/downhill_simplex.cpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/core/src/downhill_simplex.cpp
 @@ -450,6 +450,9 @@ protected:
  };
Index: patches/patch-modules_core_src_system.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_core_src_system.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-modules_core_src_system.cpp
--- patches/patch-modules_core_src_system.cpp	29 Apr 2013 21:31:12 -0000	1.1
+++ patches/patch-modules_core_src_system.cpp	30 Dec 2015 18:16:22 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-modules_core_src_system.cpp,v 1.1 2013/04/29 21:31:12 joerg Exp $

---- modules/core/src/system.cpp.orig	2013-04-28 15:15:06.000000000 +0000
+--- modules/core/src/system.cpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/core/src/system.cpp
-@@ -79,6 +79,7 @@
+@@ -184,6 +184,7 @@ std::wstring GetTempFileNameWinRT(std::w
  #include <pthread.h>
  #include <sys/time.h>
  #include <time.h>
Index: patches/patch-modules_flann_include_opencv2_flann_defines.h
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_flann_include_opencv2_flann_defines.h,v
retrieving revision 1.1
diff -u -r1.1 patch-modules_flann_include_opencv2_flann_defines.h
--- patches/patch-modules_flann_include_opencv2_flann_defines.h	12 Jun 2013 10:13:58 -0000	1.1
+++ patches/patch-modules_flann_include_opencv2_flann_defines.h	30 Dec 2015 18:16:22 -0000
@@ -2,7 +2,7 @@

 Avoid CS conflict on SunOS.

---- modules/flann/include/opencv2/flann/defines.h.orig	2012-09-27 22:55:06.000000000 +0000
+--- modules/flann/include/opencv2/flann/defines.h.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/flann/include/opencv2/flann/defines.h
 @@ -71,6 +71,9 @@
  #define FLANN_PLATFORM_32_BIT
Index: patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v
retrieving revision 1.1
diff -u -r1.1 patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
--- patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp	13 Oct 2015 14:37:43 -0000	1.1
+++ patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp	30 Dec 2015 18:16:22 -0000
@@ -1,10 +1,10 @@
 $NetBSD: patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v 1.1 2015/10/13 14:37:43 joerg Exp $

---- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig	2015-10-13 12:31:00.000000000 +0000
+--- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
-@@ -45,7 +45,7 @@
- #define __OPENCV_OBJDETECT_DBT_HPP__
+@@ -46,7 +46,7 @@

+ // After this condition removal update blacklist for bindings: modules/python/common.cmake
  #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
 -  (defined(__cplusplus) &&  __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
 +  (defined(__cplusplus) &&  __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
Index: patches/patch-modules_ts_src_ts.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/opencv/patches/patch-modules_ts_src_ts.cpp,v
retrieving revision 1.3
diff -u -r1.3 patch-modules_ts_src_ts.cpp
--- patches/patch-modules_ts_src_ts.cpp	8 Oct 2015 17:45:59 -0000	1.3
+++ patches/patch-modules_ts_src_ts.cpp	30 Dec 2015 18:16:22 -0000
@@ -2,9 +2,9 @@

 Avoid std::foo conflict.

---- modules/ts/src/ts.cpp.orig	2015-06-03 17:21:34.000000000 +0000
+--- modules/ts/src/ts.cpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/ts/src/ts.cpp
-@@ -235,7 +235,7 @@ void BaseTest::safe_run( int start_from
+@@ -234,7 +234,7 @@ void BaseTest::safe_run( int start_from 
          }
          catch (const TS::FailureCode& fc)
          {
@@ -13,7 +13,7 @@
              ts->printf(TS::LOG, "General failure:\n\t%s (%d)\n", errorStr.c_str(), fc);

              ts->set_failed_test_info( fc );
-@@ -558,7 +558,7 @@ void TS::vprintf( int streams, const cha
+@@ -561,7 +561,7 @@ void TS::vprintf( int streams, const cha
      for( int i = 0; i < MAX_IDX; i++ )
          if( (streams & (1 << i)) )
          {
@@ -22,7 +22,7 @@
              // in the new GTest-based framework we do not use
              // any output files (except for the automatically generated xml report).
              // if a test fails, all the buffers are printed, so we do not want to duplicate the information and
-@@ -613,7 +613,7 @@ void smoothBorder(Mat& img, const Scalar
+@@ -616,7 +616,7 @@ void smoothBorder(Mat& img, const Scalar
      Scalar s;
      uchar *p = NULL;
      int n = 100/delta;

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->linux-pkg-people
Responsible-Changed-By: hauke@NetBSD.org
Responsible-Changed-When: Thu, 14 Jan 2016 21:43:00 +0000
Responsible-Changed-Why:
A Linux problem


From: coypu@SDF.ORG
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/50657: graphics/opencv build fails on Linux
Date: Sun, 29 May 2016 17:34:02 +0000

 Someone has updated graphics/opencv to 3.1.0 (while ignoring this
 suggestion).

 Given that it is not appearing as a build failure in a nearly identical
 setup, I'm inclined to believe this problem was fixed

 recent bulk build for linux 2.6.32 - x86_64:
 http://mail-index.netbsd.org/pkgsrc-bulk/2016/05/28/msg012773.html

From: Benny Siegert <bsiegert@gmail.com>
To: gnats-bugs@netbsd.org
Cc: linux-pkg-people@netbsd.org, gnats-admin@netbsd.org, 
	pkgsrc-bugs@netbsd.org, "rodent@netbsd.org" <rodent@netbsd.org>
Subject: Re: pkg/50657: graphics/opencv build fails on Linux
Date: Sun, 29 May 2016 21:39:15 +0200

 On Sun, May 29, 2016 at 7:35 PM,  <coypu@sdf.org> wrote:
 >  Given that it is not appearing as a build failure in a nearly identical
 >  setup, I'm inclined to believe this problem was fixed

 The problem is that on all Linux bulk builds, opencv is listed as
 indirect-failed:

 http://bulktracker.appspot.com/pkgresults/graphics/opencv

 So it is not clear whether the issue is actually fixed or not.

State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Tue, 31 May 2016 09:53:47 +0000
State-Changed-Why:
I did a test build on Debian GNU/Linux. It builds fine if you set
PKGSRC_FORTRAN=gfortran
and apt install gfortran.


From: rodent@NetBSD.org
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/50657 (graphics/opencv build fails on Linux)
Date: Tue, 31 May 2016 09:16:16 -0400

 On Tue, May 31, 2016 at 09:53:47AM +0000, bsiegert@NetBSD.org wrote:
 > I did a test build on Debian GNU/Linux. It builds fine if you set
 > PKGSRC_FORTRAN=gfortran
 > and apt install gfortran.

 Was that requirement committed to the Makefile, wrapped in some .if $OPSYS
 block? Also, would pkgsrc pull in gfortran if it weren't installed on the
 system?

From: Benny Siegert <bsiegert@gmail.com>
To: gnats-bugs@NetBSD.org,
 rodent@NetBSD.org
Cc: linux-pkg-people@netbsd.org,
 gnats-admin@netbsd.org,
 pkgsrc-bugs@netbsd.org
Subject: Re: pkg/50657 (graphics/opencv build fails on Linux)
Date: Fri, 3 Jun 2016 22:13:43 +0200

 > Was that requirement committed to the Makefile, wrapped in some .if =
 $OPSYS
 > block? Also, would pkgsrc pull in gfortran if it weren't installed on =
 the
 > system?

 No. The default is g95, which does not build. You can follow along that =
 particular discussion in PR pkg/51198.=

>Unformatted:

Home	PR Database Search