alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

opencv-4: 4.3.0 -> 4.5.2

Browse source 
- 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
This commit is contained in:
Thiago Franco de Moraes 2021-04-11 19:01:59 -03:00
parent e23957211c
commit cab40572d7
No known key found for this signature in database
GPG key ID: 1B96996EE6559B7A
2 changed files with 135 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

208
pkgs/development/libraries/opencv/4.x.nix
View file

@ -1,54 +1,91 @@
{ lib, stdenv { lib
, fetchurl, fetchFromGitHub, fetchpatch , stdenv
, cmake, pkg-config, unzip, zlib, pcre, hdf5 , fetchurl
, glog, boost, gflags, protobuf , fetchFromGitHub
, cmake
, pkg-config
, unzip
, zlib
, pcre
, hdf5
, boost
, gflags
, protobuf
, config , config
, enableJPEG ? true, libjpeg , enableJPEG ? true
, enablePNG ? true, libpng , libjpeg
, enableTIFF ? true, libtiff , enablePNG ? true
, enableWebP ? true, libwebp , libpng
, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableTIFF ? true
, enableEigen ? true, eigen , libtiff
, enableOpenblas ? true, openblas, blas, lapack , enableWebP ? true
, enableContrib ? true , libwebp
, enableEXR ? !stdenv.isDarwin
, openexr
, ilmbase
, enableEigen ? true
, eigen
, enableOpenblas ? true
, openblas
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false) && , enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64
stdenv.hostPlatform.isx86_64, cudatoolkit, nvidia-optical-flow-sdk , cudatoolkit
, nvidia-optical-flow-sdk
, enableUnfree ? false , enableUnfree ? false
, enableIpp ? false , enableIpp ? false
, enablePython ? false, pythonPackages , enablePython ? false
, enableGtk2 ? false, gtk2 , pythonPackages
, enableGtk3 ? false, gtk3 , enableGtk2 ? false
, enableVtk ? false, vtk , gtk2
, enableFfmpeg ? false, ffmpeg_3 , enableGtk3 ? false
, enableGStreamer ? false, gst_all_1 , gtk3
, enableTesseract ? false, tesseract, leptonica , enableVtk ? false
, enableTbb ? false, tbb , vtk
, enableOvis ? false, ogre , enableFfmpeg ? true
, enableGPhoto2 ? false, libgphoto2 , ffmpeg_3
, enableDC1394 ? false, libdc1394 , enableGStreamer ? true
, enableDocs ? false, doxygen, graphviz-nox , gst_all_1
, enableTesseract ? false
, tesseract
, leptonica
, enableTbb ? false
, tbb
, enableOvis ? false
, ogre
, enableGPhoto2 ? false
, libgphoto2
, enableDC1394 ? false
, libdc1394
, enableDocs ? false
, doxygen
, graphviz-nox
, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 , AVFoundation
, Cocoa
, VideoDecodeAcceleration
, CoreMedia
, MediaToolbox
, bzip2
}: }:
let let
version = "4.3.0"; version = "4.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv"; repo = "opencv";
rev = version; rev = version;
sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775"; sha256 = "sha256-pxi1VBF4txvRqspdqvCsAQ3XKzl633/o3wyOgD9wid4=";
}; };
contribSrc = fetchFromGitHub { contribSrc = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_contrib"; repo = "opencv_contrib";
rev = version; rev = version;
sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49"; sha256 = "sha256-iMenRTY+qeL7WRgnRuQbsHflYDakE7pWWSHeIjrg0Iw=";
}; };
# Contrib must be built in order to enable Tesseract support: # Contrib must be built in order to enable Tesseract support:
@ -57,35 +94,35 @@ let
# See opencv/3rdparty/ippicv/ippicv.cmake # See opencv/3rdparty/ippicv/ippicv.cmake
ippicv = { ippicv = {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_3rdparty"; repo = "opencv_3rdparty";
rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; rev = "a56b6ac6f030c312b2dce17430eef13aed9af274";
sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq";
} + "/ippicv"; } + "/ippicv";
files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
{ ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
else if stdenv.hostPlatform.system == "i686-linux" then else if stdenv.hostPlatform.system == "i686-linux" then
{ ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
else if stdenv.hostPlatform.system == "x86_64-darwin" then else if stdenv.hostPlatform.system == "x86_64-darwin" then
{ ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
else else
throw "ICV is not available for this platform (or not yet supported by this package)"; throw "ICV is not available for this platform (or not yet supported by this package)";
dst = ".cache/ippicv"; dst = ".cache/ippicv";
}; };
# See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
vgg = { vgg = {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_3rdparty"; repo = "opencv_3rdparty";
rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
}; };
files = { files = {
"vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179";
"vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225"; "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225";
"vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5"; "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5";
"vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75"; "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
}; };
dst = ".cache/xfeatures2d/vgg"; dst = ".cache/xfeatures2d/vgg";
@ -94,19 +131,19 @@ let
# See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
boostdesc = { boostdesc = {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_3rdparty"; repo = "opencv_3rdparty";
rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62"; sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
}; };
files = { files = {
"boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f"; "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f";
"boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191"; "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191";
"boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e"; "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e";
"boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f"; "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
"boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b"; "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
"boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea"; "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
"boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052"; "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052";
}; };
dst = ".cache/xfeatures2d/boostdesc"; dst = ".cache/xfeatures2d/boostdesc";
}; };
@ -114,9 +151,9 @@ let
# See opencv_contrib/modules/face/CMakeLists.txt # See opencv_contrib/modules/face/CMakeLists.txt
face = { face = {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_3rdparty"; repo = "opencv_3rdparty";
rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12";
sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v"; sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v";
}; };
files = { files = {
@ -136,10 +173,27 @@ let
dst = ".cache/ade"; dst = ".cache/ade";
}; };
# See opencv/modules/wechat_qrcode/CMakeLists.txt
wechat_qrcode = {
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv_3rdparty";
rev = "a8b69ccc738421293254aec5ddb38bd523503252";
sha256 = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY=";
};
files = {
"detect.caffemodel" = "238e2b2d6f3c18d6c3a30de0c31e23cf";
"detect.prototxt" = "6fb4976b32695f9f5c6305c19f12537d";
"sr.caffemodel" = "cbfcd60361a73beb8c583eea7e8e6664";
"sr.prototxt" = "69db99927a70df953b471daaba03fbef";
};
dst = ".cache/wechat_qrcode";
};
# See opencv/cmake/OpenCVDownload.cmake # See opencv/cmake/OpenCVDownload.cmake
installExtraFiles = extra : with lib; '' installExtraFiles = extra: with lib; ''
mkdir -p "${extra.dst}" mkdir -p "${extra.dst}"
'' + concatStrings (flip mapAttrsToList extra.files (name : md5 : '' '' + concatStrings (flip mapAttrsToList extra.files (name: md5: ''
ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
'')); ''));
installExtraFile = extra: '' installExtraFile = extra: ''
@ -149,7 +203,7 @@ let
opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
printEnabled = enabled : if enabled then "ON" else "OFF"; printEnabled = enabled: if enabled then "ON" else "OFF";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -172,13 +226,15 @@ stdenv.mkDerivation {
preConfigure = preConfigure =
installExtraFile ade + installExtraFile ade +
lib.optionalString enableIpp (installExtraFiles ippicv) + ( lib.optionalString enableIpp (installExtraFiles ippicv) + (
lib.optionalString buildContrib '' lib.optionalString buildContrib ''
cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
${installExtraFiles vgg} ${installExtraFiles vgg}
${installExtraFiles boostdesc} ${installExtraFiles boostdesc}
${installExtraFiles face} ${installExtraFiles face}
''); ${installExtraFiles wechat_qrcode}
''
);
postConfigure = '' postConfigure = ''
[ -e modules/core/version_string.inc ] [ -e modules/core/version_string.inc ]
@ -186,7 +242,7 @@ stdenv.mkDerivation {
''; '';
buildInputs = buildInputs =
[ zlib pcre hdf5 glog boost gflags protobuf ] [ zlib pcre hdf5 boost gflags protobuf ]
++ lib.optional enablePython pythonPackages.python ++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3 ++ lib.optional enableGtk3 gtk3
@ -198,7 +254,7 @@ stdenv.mkDerivation {
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optional enableFfmpeg ffmpeg_3
++ lib.optionals (enableFfmpeg && stdenv.isDarwin) ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ] [ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableOvis ogre ++ lib.optional enableOvis ogre
++ lib.optional enableGPhoto2 libgphoto2 ++ lib.optional enableGPhoto2 libgphoto2
@ -274,15 +330,13 @@ stdenv.mkDerivation {
"$out/lib/pkgconfig/opencv4.pc" "$out/lib/pkgconfig/opencv4.pc"
''; '';
hardeningDisable = [ "bindnow" "relro" ]; passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; };
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
meta = with lib; { meta = with lib; {
description = "Open Computer Vision Library with more than 500 algorithms"; description = "Open Computer Vision Library with more than 500 algorithms";
homepage = "https://opencv.org/"; homepage = "https://opencv.org/";
license = with licenses; if enableUnfree then unfree else bsd3; license = with licenses; if enableUnfree then unfree else bsd3;
maintainers = with maintainers; [mdaiter basvandijk]; maintainers = with maintainers; [ mdaiter basvandijk ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };
} }

34
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch
View file

@ -1,40 +1,17 @@
From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 26 Apr 2020 14:50:25 -0700
Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR
Use find_package for this.
---
CMakeLists.txt | 2 ++
cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c0b3880fc..0360469350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed.
")
endif()
+# the future!
+include(FindPkgConfig)
include(cmake/OpenCVMinDepVersions.cmake)
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 0beaf19317..4c5e46e615 100644 index 23a6ca6959..27e121943a 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake --- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -227,20 +227,11 @@ endif() @@ -255,21 +255,12 @@ endif()
# --- OpenEXR (optional) --- # --- OpenEXR (optional) ---
if(WITH_OPENEXR) if(WITH_OPENEXR)
ocv_clear_vars(HAVE_OPENEXR) ocv_clear_vars(HAVE_OPENEXR)
- if(NOT BUILD_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") - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
- endif() - endif()
-
+ pkg_check_modules(OPENEXR OpenEXR) + pkg_check_modules(OPENEXR OpenEXR)
if(OPENEXR_FOUND) if(OPENEXR_FOUND)
set(HAVE_OPENEXR YES) set(HAVE_OPENEXR YES)
- else() - else()
@ -50,6 +27,3 @@ index 0beaf19317..4c5e46e615 100644
endif() endif()
endif() endif()
--
2.26.1