CVS commit: pkgsrc/graphics/opencv

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 03:49:57 UTC 2016

Modified Files:
        pkgsrc/graphics/opencv: distinfo
Added Files:
        pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVPCHSupport.cmake

Log Message:
gcc6 build fix


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.35 pkgsrc/graphics/opencv/distinfo:1.36
--- pkgsrc/graphics/opencv/distinfo:1.35        Tue Mar  1 20:14:24 2016
+++ pkgsrc/graphics/opencv/distinfo     Sat Jul 16 03:49:56 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2016/03/01 20:14:24 joerg Exp $
+$NetBSD: distinfo,v 1.36 2016/07/16 03:49:56 markd Exp $
 
 SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b
 RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165
@@ -10,6 +10,7 @@ SHA1 (patch-apps_createsamples_CMakeList
 SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
 SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d
+SHA1 (patch-cmake_OpenCVPCHSupport.cmake) = 237fa2d000c402c55dfdbec3e27c89cffdfde8b1
 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) = c64ef8872c120db0ab92582496235858eec9bf92

Added files:

Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake:1.1
--- /dev/null   Sat Jul 16 03:49:57 2016
+++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake   Sat Jul 16 03:49:57 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_OpenCVPCHSupport.cmake,v 1.1 2016/07/16 03:49:57 markd Exp $
+
+gcc6 trips up ".../cstdlib:75:25: fatal error: stdlib.h: No such file or directory" because of -isystem
+
+--- cmake/OpenCVPCHSupport.cmake.orig  2015-12-18 15:02:16.000000000 +0000
++++ cmake/OpenCVPCHSupport.cmake
+@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+         OUTPUT_VARIABLE gcc_compiler_version)
+     #MESSAGE("GCC Version: ${gcc_compiler_version}")
+-    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
++    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
+         SET(PCHSupport_FOUND TRUE)
+     ENDIF()
+