head	1.3;
access;
symbols
	pkgsrc-2024Q4:1.2.0.10
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.8
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.6
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.4
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.2
	pkgsrc-2023Q4-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2025.02.07.21.54.16;	author wiz;	state dead;
branches;
next	1.2;
commitid	RS8OGY8QeR4wlAIF;

1.2
date	2023.12.22.15.35.44;	author thor;	state Exp;
branches;
next	1.1;
commitid	OBpChQ4DcfDtwtRE;

1.1
date	2023.12.22.07.35.07;	author thor;	state Exp;
branches;
next	;
commitid	RcajIgvK2sg8QqRE;


desc
@@


1.3
log
@opencv: update to 4.11.0.

This is the new major version under the Apache 2 license.
Too many changes to list, no concise summary found. Details at:
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs-v2.2%E2%80%90v4.10
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110
@
text
@$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
@@@@ -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)
-      #message(FATAL_ERROR "LAPACK: check build log:\n${TRY_OUT}")
+      message(FATAL_ERROR "LAPACK: check build log:\n${TRY_OUT}")
       message(STATUS "LAPACK(${LAPACK_IMPL}): Can't build LAPACK check code. This LAPACK version is not supported.")
       unset(LAPACK_LIBRARIES)
     else()
@@@@ -98,6 +101,22 @@@@ endmacro()
 if(WITH_LAPACK)
   ocv_update(LAPACK_IMPL "Unknown")
   if(NOT OPENCV_LAPACK_FIND_PACKAGE_ONLY)
+    # Mimicking cmake's FindBLAS with BLA_PREFER_PKGCONFIG
+    if(NOT LAPACK_LIBRARIES AND BLA_PREFER_PKGCONFIG)
+       find_package(PkgConfig)
+       pkg_search_module(PKG_BLAS ${BLA_PKGCONFIG_BLAS} blas)
+       pkg_search_module(PKG_LAPACK ${BLA_PKGCONFIG_LAPACK} lapack)
+       pkg_search_module(PKG_CBLAS ${BLA_PKGCONFIG_CBLAS} cblas)
+       pkg_search_module(PKG_LAPACKE ${BLA_PKGCONFIG_LAPACKE} lapacke)
+       if(PKG_BLAS_FOUND AND PKG_LAPACK_FOUND AND PKG_CBLAS_FOUND AND PKG_LAPACKE_FOUND)
+          set(LAPACK_INCLUDE_DIR ${PKG_CBLAS_INCLUDE_DIRS} ${PKG_LAPACKE_INCLUDE_DIRS} ${PKG_BLAS_INCLUDE_DIRS} ${PKG_LAPACK_INCLUDE_DIRS})
+          set(LAPACK_LIBRARIES ${PKG_CBLAS_LIBRARIES} ${PKG_LAPACKE_LIBRARIES} ${PKG_BLAS_LIBRARIES} ${PKG_LAPACK_LIBRARIES})
+          set(LAPACK_CBLAS_H   "cblas.h")
+          set(LAPACK_LAPACKE_H "lapacke.h")
+          set(LAPACK_IMPL      "pkg")
+          ocv_lapack_check()
+       endif()
+    endif()
     if(NOT LAPACK_LIBRARIES AND NOT OPENCV_LAPACK_DISABLE_MKL)
       include(cmake/OpenCVFindMKL.cmake)
       if(HAVE_MKL)
@


1.2
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@opencv: version 3.4.17 with proper explicit BLAS (CBLAS + LAPACKE) usage

This does the small bugfix update from 3.4.16 to 3.4.17 and adds proper usage
of BLAS stuff. There was linkage to BLAS before via numpy, but the internal
explicit BLAS-using code was not built, as the CMake machinery did not find it.

This commit drops an actually counterproductive patch and adds pkg-config
calls to find the BLAS-related libraries. Note that vor opencv-contrib-face,
the BLAS choice during its build doesn't really enter the result, apparently,
but the build process does use it and it would not help to confuse matters there.

I am not sure if the buildlink3.mk should also add blas.buildlink3.mk now. It
does not feature numpy right now. Should it?

Next step should be move towards 4.x at least.

Upstream:

December, 2021

OpenCV 3.4.17 has been released. Bug fixes, optimizations and other enhancements
are propagated into OpenCV 4.5.5.

Long-lived OpenCV 3.x release series is here since 2015. We are going to reduce
support of 3.x branch in the future to move forward to OpenCV 5.0.
@
text
@d5 11
a15 1
@@@@ -84,7 +84,7 @@@@ macro(ocv_lapack_check)
d24 1
a24 1
@@@@ -98,6 +98,22 @@@@ endmacro()
@