CVS commit: pkgsrc/graphics/opencv

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Fri Dec 22 15:35:44 UTC 2023

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

Log Message:
graphics/opencv: avoid name-clash of complex macro for gcc<4.8

This adds #undef complex explicitly, to fix the build for older gccs that
don't have that in their headers for C++ code.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.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.58 pkgsrc/graphics/opencv/distinfo:1.59
--- pkgsrc/graphics/opencv/distinfo:1.58        Fri Dec 22 07:35:07 2023
+++ pkgsrc/graphics/opencv/distinfo     Fri Dec 22 15:35:44 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2023/12/22 07:35:07 thor Exp $
+$NetBSD: distinfo,v 1.59 2023/12/22 15:35:44 thor Exp $
 
 BLAKE2s (opencv-3.4.17.tar.gz) = f8cbf244836026ef700534a4aa35a96f0e1521a6a5aa05ffecb90b1cdbcb75d3
 SHA512 (opencv-3.4.17.tar.gz) = b17a4a04ab29f0f966681a825af782039a2cc6564956894aba639731542fdb86d316b16b96e2d45de8b5e0db7c79ce4b4c348b82ccd124d125aacb7c02026841
@@ -9,7 +9,7 @@ SHA1 (patch-CMakeLists.txt) = 86a5246830
 SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
 SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
-SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = e8c474d91ba6de7c3204fcd753a33d33847b18b8
+SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad
 SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
 SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa

Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake
diff -u pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake:1.1 pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake:1.2
--- pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake:1.1       Fri Dec 22 07:35:07 2023
+++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake   Fri Dec 22 15:35:44 2023
@@ -1,8 +1,18 @@
-$NetBSD: patch-cmake_OpenCVFindLAPACK.cmake,v 1.1 2023/12/22 07:35:07 thor Exp $
+$NetBSD: patch-cmake_OpenCVFindLAPACK.cmake,v 1.2 2023/12/22 15:35:44 thor Exp $
 
 --- cmake/OpenCVFindLAPACK.cmake.orig  2021-12-24 16:39:15.000000000 +0000
 +++ cmake/OpenCVFindLAPACK.cmake
-@@ -84,7 +84,7 @@ macro(ocv_lapack_check)
+@@ -52,6 +52,9 @@ macro(ocv_lapack_check)
+       list(APPEND _lapack_content "#include \"${OPENCV_LAPACKE_H_PATH_${_lapack_impl}}\"")
+     endif()
+     list(APPEND _lapack_content "
++/* avoid name clashes with older gcc, alias to _Complex breaking std::complex */
++#undef complex
++
+ #if defined(LAPACK_GLOBAL) || defined(LAPACK_NAME)
+ /*
+  * Using netlib's reference LAPACK implementation version >= 3.4.0 (first with C interface).
+@@ -84,7 +87,7 @@ macro(ocv_lapack_check)
          OUTPUT_VARIABLE TRY_OUT
      )
      if(NOT __VALID_LAPACK)
@@ -11,7 +21,7 @@ $NetBSD: patch-cmake_OpenCVFindLAPACK.cm
        message(STATUS "LAPACK(${LAPACK_IMPL}): Can't build LAPACK check code. This LAPACK version is not supported.")
        unset(LAPACK_LIBRARIES)
      else()
-@@ -98,6 +98,22 @@ endmacro()
+@@ -98,6 +101,22 @@ endmacro()
  if(WITH_LAPACK)
    ocv_update(LAPACK_IMPL "Unknown")
    if(NOT OPENCV_LAPACK_FIND_PACKAGE_ONLY)