nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv: 4.5.4 -> 4.6.0

Browse Source
This commit is contained in:
Yureka 2022-09-21 13:08:28 +02:00
parent 19aa0eb4de
commit 595ed0ec11
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/opencv/4.x.nix
View File

@ -76,20 +76,20 @@
}: }:
let let
version = "4.5.4"; version = "4.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv"; repo = "opencv";
rev = version; rev = version;
sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70="; sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg=";
}; };
contribSrc = fetchFromGitHub { contribSrc = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_contrib"; repo = "opencv_contrib";
rev = version; rev = version;
sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0="; sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE=";
}; };
# Contrib must be built in order to enable Tesseract support: # Contrib must be built in order to enable Tesseract support:
@ -177,7 +177,7 @@ let
dst = ".cache/ade"; dst = ".cache/ade";
}; };
# See opencv/modules/wechat_qrcode/CMakeLists.txt # See opencv_contrib/modules/wechat_qrcode/CMakeLists.txt
wechat_qrcode = { wechat_qrcode = {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";

6
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch
View File

@ -1,8 +1,8 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 23a6ca6959..27e121943a 100644 index 00886cc131..e412771322 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake --- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -255,21 +255,12 @@ endif() @@ -257,23 +257,12 @@ endif()
# --- OpenEXR (optional) --- # --- OpenEXR (optional) ---
if(WITH_OPENEXR) if(WITH_OPENEXR)
ocv_clear_vars(HAVE_OPENEXR) ocv_clear_vars(HAVE_OPENEXR)
@ -20,7 +20,9 @@ index 23a6ca6959..27e121943a 100644
- set(OPENEXR_LIBRARIES IlmImf) - set(OPENEXR_LIBRARIES IlmImf)
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") - add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
- if(OPENEXR_VERSION) # check via TARGET doesn't work - if(OPENEXR_VERSION) # check via TARGET doesn't work
- set(BUILD_OPENEXR ON)
- set(HAVE_OPENEXR YES) - set(HAVE_OPENEXR YES)
- set(BUILD_OPENEXR ON)
- endif() - endif()
+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) + set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
+ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) + set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})