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

opencv: 3.4.2 -> 3.4.3

Browse source
This commit is contained in:
Bas van Dijk 2018-09-03 12:38:50 +02:00
parent 185f0015f2
commit 252c0d4c82
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/opencv/3.x.nix
View file

@ -35,20 +35,20 @@
}: }:
let let
version = "3.4.2"; version = "3.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv"; repo = "opencv";
rev = version; rev = version;
sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx"; sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
}; };
contribSrc = fetchFromGitHub { contribSrc = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_contrib"; repo = "opencv_contrib";
rev = version; rev = version;
sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz"; sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
}; };
# Contrib must be built in order to enable Tesseract support: # Contrib must be built in order to enable Tesseract support:
@ -145,11 +145,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
''; '';
# TODO: remove the following patch once commit
# https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
# is released.
patches = [ ./fix-dnn.patch ];
# This prevents cmake from using libraries in impure paths (which # This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS) # causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with

13
pkgs/development/libraries/opencv/fix-dnn.patch
View file

@ -1,13 +0,0 @@
diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
index 730c752ce..abbce0453 100644
--- a/modules/dnn/src/caffe/caffe_io.cpp
+++ b/modules/dnn/src/caffe/caffe_io.cpp
@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
std::ifstream fs(filename, std::ifstream::in);
CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
IstreamInputStream input(&fs);
- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
+ return google::protobuf::TextFormat::Parser().Parse(&input, proto);
}
bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {