diff options
Diffstat (limited to 'media-libs/opencv/files')
| -rw-r--r-- | media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch | 26 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch | 18 |
2 files changed, 44 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch new file mode 100644 index 000000000000..89ac1ff47ca1 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch @@ -0,0 +1,26 @@ + cmake/OpenCVCompilerOptimizations.cmake | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake +index 970dd28903..b56892bb12 100644 +--- a/cmake/OpenCVCompilerOptimizations.cmake ++++ b/cmake/OpenCVCompilerOptimizations.cmake +@@ -156,12 +156,12 @@ if(";${CPU_BASELINE};" MATCHES ";NATIVE;" OR ";${CPU_BASELINE};" MATCHES ";HOST; + set(_add_native_flag ON) + elseif(";${CPU_BASELINE};" MATCHES ";DETECT;") + set(CPU_BASELINE_DETECT ON) +-elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") +- if(DEFINED CPU_BASELINE) +- message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") +- endif() +- set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") +- set(CPU_BASELINE_DETECT ON) ++#elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") ++# if(DEFINED CPU_BASELINE) ++# message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") ++# endif() ++# set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") ++# set(CPU_BASELINE_DETECT ON) + endif() + + if(X86 OR X86_64) diff --git a/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch new file mode 100644 index 000000000000..acee677052d6 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake +index 342bebc..9ebd206 100644 +--- a/cmake/OpenCVFindLAPACK.cmake ++++ b/cmake/OpenCVFindLAPACK.cmake +@@ -136,10 +136,12 @@ if(WITH_LAPACK) + ocv_lapack_check() + endif() + if(NOT HAVE_LAPACK) +- if(LAPACKE_INCLUDE_DIR) ++ find_package(CBLAS) ++ if(LAPACKE_INCLUDE_DIR AND CBLAS_FOUND) + set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) + set(LAPACK_CBLAS_H "cblas.h") + set(LAPACK_LAPACKE_H "lapacke.h") ++ set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES}) + set(LAPACK_IMPL "LAPACK/Generic") + ocv_lapack_check() + elseif(APPLE) |