Unverified Commit 403bfc5a authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #192233 from yu-re-ka/opencv-4-6-0 

opencv: 4.5.4 -> 4.6.0
parents 374f1f40 d948d26a

pkgs/development/libraries/opencv/3.x.nix

+3 −8
Original line number Diff line number Diff line
@@ -40,20 +40,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; 
assert enablePython -> pythonPackages != null;



let

  version = "3.4.15";

  version = "3.4.18";



  src = fetchFromGitHub {

    owner  = "opencv";

    repo   = "opencv";

    rev    = version;

    hash   = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc=";

    hash   = "sha256-PgwAZNoPknFT0jCLt3TCzend6OYFY3iUIzDf/FptAYA=";

  };



  contribSrc = fetchFromGitHub {

    owner  = "opencv";

    repo   = "opencv_contrib";

    rev    = version;

    hash   = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg=";

    hash   = "sha256-TEF/GHglOmsshlC6q4iw14ZMpvA0SaKwlidomAN+sRc=";

  };



  # Contrib must be built in order to enable Tesseract support:
@@ -155,11 +155,6 @@ stdenv.mkDerivation { 
  # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.

  patches = [

    ./cmake-don-t-use-OpenCVFindOpenEXR.patch

    # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release.

    (fetchpatch {

      url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch";

      sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41";

    })

  ];



  # This prevents cmake from using libraries in impure paths (which

pkgs/development/libraries/opencv/4.x.nix

+4 −4
Original line number Diff line number Diff line
@@ -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";

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

+4 −2
Original line number Diff line number Diff line 
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})