From 3def42d8603c66534c705e6da511b77f2d645c04 Mon Sep 17 00:00:00 2001 From: Vincent <vincent.pollet@idiap.ch> Date: Wed, 18 Nov 2020 13:47:20 +0100 Subject: [PATCH] Disable QT --- conda/opencv/build.sh | 2 +- conda/opencv/meta.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conda/opencv/build.sh b/conda/opencv/build.sh index 227cb458..fc382044 100644 --- a/conda/opencv/build.sh +++ b/conda/opencv/build.sh @@ -8,7 +8,7 @@ MACHINE_STR=$(uname -m) # https://gitlab.kitware.com/cmake/cmake/blob/master/Modules/FindPNG.cmake#L55 ln -s $PREFIX/include/libpng16 $PREFIX/include/libpng -QT="5" +QT="OFF" V4L="1" if [ "${SHORT_OS_STR:0:5}" == "Linux" ]; then diff --git a/conda/opencv/meta.yaml b/conda/opencv/meta.yaml index 833dae8f..bf595f52 100644 --- a/conda/opencv/meta.yaml +++ b/conda/opencv/meta.yaml @@ -83,14 +83,12 @@ requirements: - harfbuzz {{ harfbuzz }} # [unix] - libpng {{ libpng }} - ffmpeg {{ ffmpeg }} # [not win] - - qt 5.9.* # [not osx and not aarch64 and not ppc64le] - freetype {{ freetype }} - glib {{ glib }} # [unix] run: - {{ pin_compatible('harfbuzz') }} # [unix] # Don't depend on python in the run section # py-opencv will depend on python - - qt 5.9.* # [not osx and not aarch64 and not ppc64le] # https://github.com/conda-forge/opencv-feedstock/issues/174 # Seems like the OSX ABI has changed between 2.9 and 2.10??? # That or a dependency wasn't merged in @@ -107,7 +105,6 @@ test: - nomkl # [blas_impl == 'openblas'] - cmake - ninja - - qt 5.9.* # [linux64] files: - CMakeLists.txt - test.cpp -- GitLab