cab40572d7
- Updated to 4.5.2 - Removed glog from buildInputs because of this error on python-opencv: ``` python -c "import cv2" /nix/store/slfzk1gk74nfx3ky2vpdf9nb7b8nvdf2-opencv-4.5.2/lib/libopencv_sfm.so.4.5: error: symbol lookup error: undefined symbol: _ZN6google21kLogSiteUninitializedE (fatal) ``` - Enabled ffmpeg and gstreamer to open more video formats - nixpkg-fmt
29 lines
1 KiB
Diff
29 lines
1 KiB
Diff
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
index 23a6ca6959..27e121943a 100644
|
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -255,21 +255,12 @@ endif()
|
|
# --- OpenEXR (optional) ---
|
|
if(WITH_OPENEXR)
|
|
ocv_clear_vars(HAVE_OPENEXR)
|
|
- if(NOT BUILD_OPENEXR)
|
|
- ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
|
|
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
|
- endif()
|
|
+ pkg_check_modules(OPENEXR OpenEXR)
|
|
|
|
if(OPENEXR_FOUND)
|
|
set(HAVE_OPENEXR YES)
|
|
- else()
|
|
- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
|
|
-
|
|
- set(OPENEXR_LIBRARIES IlmImf)
|
|
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
|
|
- if(OPENEXR_VERSION) # check via TARGET doesn't work
|
|
- set(HAVE_OPENEXR YES)
|
|
- endif()
|
|
+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
|
|
+ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})
|
|
endif()
|
|
endif()
|
|
|