pyrox.dev
lol
opencv: 4.5.4 -> 4.6.0
+8
-6
+4
-4
pkgs/development/libraries/opencv/4.x.nix
+4
-4
pkgs/development/libraries/opencv/4.x.nix
···
76
76
}:
77
77
78
78
let
79
-
version = "4.5.4";
79
+
version = "4.6.0";
80
80
81
81
src = fetchFromGitHub {
82
82
owner = "opencv";
83
83
repo = "opencv";
84
84
rev = version;
85
-
sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70=";
85
+
sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg=";
86
86
};
87
87
88
88
contribSrc = fetchFromGitHub {
89
89
owner = "opencv";
90
90
repo = "opencv_contrib";
91
91
rev = version;
92
-
sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0=";
92
+
sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE=";
93
93
};
94
94
95
95
# Contrib must be built in order to enable Tesseract support:
···
177
177
dst = ".cache/ade";
178
178
};
179
179
180
-
# See opencv/modules/wechat_qrcode/CMakeLists.txt
180
+
# See opencv_contrib/modules/wechat_qrcode/CMakeLists.txt
181
181
wechat_qrcode = {
182
182
src = fetchFromGitHub {
183
183
owner = "opencv";
+4
-2
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch
+4
-2
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch
···
1
1
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
2
-
index 23a6ca6959..27e121943a 100644
2
+
index 00886cc131..e412771322 100644
3
3
--- a/cmake/OpenCVFindLibsGrfmt.cmake
4
4
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
5
-
@@ -255,21 +255,12 @@ endif()
5
+
@@ -257,23 +257,12 @@ endif()
6
6
# --- OpenEXR (optional) ---
7
7
if(WITH_OPENEXR)
8
8
ocv_clear_vars(HAVE_OPENEXR)
···
20
20
- set(OPENEXR_LIBRARIES IlmImf)
21
21
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
22
22
- if(OPENEXR_VERSION) # check via TARGET doesn't work
23
+
- set(BUILD_OPENEXR ON)
23
24
- set(HAVE_OPENEXR YES)
25
+
- set(BUILD_OPENEXR ON)
24
26
- endif()
25
27
+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
26
28
+ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})