diff options
| author | Yureka <yuka@yuka.dev> | 2022-09-21 13:08:28 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2022-09-21 13:08:28 +0200 |
| commit | 595ed0ec110db51a49c77fabb109bf92de898976 (patch) | |
| tree | a3395207ba71813186679d34c5edead450a8468a /pkgs/development/libraries/opencv | |
| parent | 19aa0eb4dec3c60436387771057de998298b3cd6 (diff) | |
| download | nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar.gz nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar.bz2 nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar.lz nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar.xz nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.tar.zst nixpkgs-595ed0ec110db51a49c77fabb109bf92de898976.zip | |
opencv: 4.5.4 -> 4.6.0
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ce7f9822335..664f39c0c6c 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -76,20 +76,20 @@ }: let - version = "4.5.4"; + version = "4.6.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70="; + sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0="; + sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE="; }; # Contrib must be built in order to enable Tesseract support: @@ -177,7 +177,7 @@ let dst = ".cache/ade"; }; - # See opencv/modules/wechat_qrcode/CMakeLists.txt + # See opencv_contrib/modules/wechat_qrcode/CMakeLists.txt wechat_qrcode = { src = fetchFromGitHub { owner = "opencv"; diff --git a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch index bb398f7546b..abeb0d9fde4 100644 --- a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch +++ b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 23a6ca6959..27e121943a 100644 +index 00886cc131..e412771322 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -255,21 +255,12 @@ endif() +@@ -257,23 +257,12 @@ endif() # --- OpenEXR (optional) --- if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) @@ -20,7 +20,9 @@ index 23a6ca6959..27e121943a 100644 - set(OPENEXR_LIBRARIES IlmImf) - add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") - if(OPENEXR_VERSION) # check via TARGET doesn't work +- set(BUILD_OPENEXR ON) - set(HAVE_OPENEXR YES) +- set(BUILD_OPENEXR ON) - endif() + set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) + set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) |