on master help sign in
Merge pull request #2611 from basvandijk/fix-opencv
0a27a81Chris Dornan
build-constraints.yaml+2−2
@@ -5,8 +5,8 @@ packages:
5 - openexr-write
5 - openexr-write
6
6
7 "Bas van Dijk <v.dijk.bas@gmail.com> @basvandijk": []
7 "Bas van Dijk <v.dijk.bas@gmail.com> @basvandijk": []
8− # - opencv # https://github.com/fpco/stackage/pull/2597#issuecomment-310930926
8+ # - opencv
9− # - opencv-extra # https://github.com/fpco/stackage/pull/2597#issuecomment-310930926
9+ # - opencv-extra
10
10
11 "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
11 "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
12 - zm
12 - zm
debian-bootstrap.sh+1−1
@@ -250,7 +250,7 @@ mkdir build
250cd build
250cd build
251cmake -D CMAKE_BUILD_TYPE=RELEASE \
251cmake -D CMAKE_BUILD_TYPE=RELEASE \
252 -D CMAKE_INSTALL_PREFIX=/usr/local \
252 -D CMAKE_INSTALL_PREFIX=/usr/local \
253− -D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv-build/opencv_contrib-${OPENCV_VERSION}/modules
253+ -D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv-build/opencv_contrib-${OPENCV_VERSION}/modules ..
254
254
255make -j
255make -j
256
256