diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml index ef0a9f22eb05b29ee2922984cae54493f7f15273..c30456ffe71f47ea56bee0698c33629e3d716c02 100644 --- a/conda/bob-devel/meta.yaml +++ b/conda/bob-devel/meta.yaml @@ -58,7 +58,7 @@ requirements: - pkg-config 0.29.2 - psycopg2 2.8.5 - pybind11 2.5.0 - - pyopengl 3.1.1 + - pyopengl 3.1.1a1 - pyqtgraph 0.11.0 - pytest 6.1.1 - pytest-cov 2.10.1 diff --git a/conda/opencv/meta.yaml b/conda/opencv/meta.yaml index 833dae8ff25ee9de7b375f8878457321dbc823eb..5f8459f6a6b8da9deeb42b190caa762fe5612d72 100644 --- a/conda/opencv/meta.yaml +++ b/conda/opencv/meta.yaml @@ -75,11 +75,10 @@ requirements: - nomkl # [blas_impl == 'openblas'] - hdf5 {{ hdf5 }} # [unix] - eigen 3.3.* - - jasper + - jasper {{ jasper }} - zlib {{ zlib }} - jpeg {{ jpeg }} - libtiff {{ libtiff }} - - libwebp {{ libwebp }} - harfbuzz {{ harfbuzz }} # [unix] - libpng {{ libpng }} - ffmpeg {{ ffmpeg }} # [not win] @@ -87,15 +86,11 @@ requirements: - 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 - # Since we don't know the cause, we are choosing this pinning on all platforms. - - {{ pin_compatible('freetype', min_pin='x.x') }} + + - {{ pin_compatible('harfbuzz') }} # [unix] + test: requires: diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 0721ab66887af699793ea151d421ee9d3b348dff..6387a768849e014c0ea8ee15419f646e7c99010b 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -74,19 +74,19 @@ ffmpeg: freetype: - 2.10 glib: - - 2 + - 2.63.1 harfbuzz: - - 2.4 + - 1.8.8 hdf5: - 1.10.6 +jasper: + - 2.0.14 jpeg: - 9 libpng: - 1.6 libtiff: - 4.1 -libwebp: - - 1.0.0 mkl: - 2019 numpy: