Update recipe

conda/opencv/build.sh

 #!/usr/bin/env bash
 
 set +x
-SHORT_OS_STR=$(uname -s)
-MACHINE_STR=$(uname -m)
 
 # CMake FindPNG seems to look in libpng not libpng16
 # https://gitlab.kitware.com/cmake/cmake/blob/master/Modules/FindPNG.cmake#L55
@@ -11,54 +9,28 @@ ln -s $PREFIX/include/libpng16 $PREFIX/include/libpng
 QT="5"
 V4L="1"
 
-if [ "${SHORT_OS_STR:0:5}" == "Linux" ]; then
-    OPENMP="-DWITH_OPENMP=1"
+if [[ "${target_platform}" == linux-* ]]; then
+    
     # Looks like there's a bug in Opencv 3.2.0 for building with FFMPEG
     # with GCC opencv/issues/8097
     export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
 
     export CPPFLAGS="${CPPFLAGS//-std=c++17/-std=c++11}"
     export CXXFLAGS="${CXXFLAGS//-std=c++17/-std=c++11}"
-
-    export LDFLAGS="${LDFLAGS} -Wl,-rpath-link,${PREFIX}/lib"
+    OPENMP="-DWITH_OPENMP=1"
 fi
-if [ "${SHORT_OS_STR}" == "Darwin" ]; then
-    OPENMP=""
+if [[ "${target_platform}" == osx-* ]]; then
     QT="0"
     V4L="0"
-    # The old OSX compilers don't know what to do with AVX instructions
-    # Therefore, we specify what CPU dispatch operations we want explicitely
-    # for OSX..
-    # I took this line from the default build flags that get spewed after
-    # a successful call to cmake without the parameter specified
-    # The default flag as of OpenCV 3.4.4 are:
-    # CPU_DISPATCH:STRING=SSE4_1;SSE4_2;AVX;FP16;AVX2;AVX512_SKX
-    CPU_DISPATCH_FLAGS="-DCPU_DISPATCH=SSE4_1;SSE4_2;AVX;FP16"
     # remove -dead_strip_dylibs from LDFLAGS if it exists
-    export LDFLAGS=${LDFLAGS//"-dead_strip_dylibs"/}
-
+    # export LDFLAGS=${LDFLAGS//"-dead_strip_dylibs"/}
 fi
 
-if [ "${MACHINE_STR}" == "aarch64" ] || [ "${MACHINE_STR:0:3}" == "arm" ] || [ "${MACHINE_STR:0:3}" == "ppc" ]; then
+if [[ "${target_platform}" != *-64 ]]; then
     QT="0"
 fi
 
-CMAKE_TOOLCHAIN_CMD_FLAGS=""
-if [ "$c_compiler" = clang ]; then
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_AR=${AR}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_LINKER=${LD}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_NM=${NM}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_RANLIB=${RANLIB}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_STRIP=${STRIP}"
-elif [ "$c_compiler" = gcc ]; then
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_AR=${AR}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_LINKER=${LD}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_NM=${NM}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_OBJCOPY=${OBJCOPY}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_OBJDUMP=${OBJDUMP}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_RANLIB=${RANLIB}"
-    CMAKE_TOOLCHAIN_CMD_FLAGS="${CMAKE_TOOLCHAIN_CMD_FLAGS} -DCMAKE_STRIP=${STRIP}"
-fi
+export PKG_CONFIG_LIBDIR=$PREFIX/lib
 
 mkdir -p build
 cd build
@@ -85,7 +57,7 @@ fi
 PYTHON_SET_FLAG="-DBUILD_opencv_python${PY_MAJOR}=1"
 PYTHON_SET_EXE="-DPYTHON${PY_MAJOR}_EXECUTABLE=${PYTHON}"
 PYTHON_SET_INC="-DPYTHON${PY_MAJOR}_INCLUDE_DIR=${INC_PYTHON} "
-PYTHON_SET_NUMPY="-DPYTHON${PY_MAJOR}_NUMPY_INCLUDE_DIRS=${SP_DIR}/numpy/core/include"
+PYTHON_SET_NUMPY="-DPYTHON${PY_MAJOR}_NUMPY_INCLUDE_DIRS=$(python -c 'import numpy;print(numpy.get_include())')"
 PYTHON_SET_LIB="-DPYTHON${PY_MAJOR}_LIBRARY=${LIB_PYTHON}"
 PYTHON_SET_SP="-DPYTHON${PY_MAJOR}_PACKAGES_PATH=${SP_DIR}"
 PYTHON_SET_INSTALL="-DOPENCV_PYTHON${PY_MAJOR}_INSTALL_PATH=${SP_DIR}"
@@ -108,11 +80,9 @@ cmake -LAH -G "Ninja"                                                     \
     -DCMAKE_INSTALL_LIBDIR="lib"                                          \
     -DOPENCV_DOWNLOAD_TRIES=1\;2\;3\;4\;5                                 \
     -DOPENCV_DOWNLOAD_PARAMS=INACTIVITY_TIMEOUT\;30\;TIMEOUT\;180\;SHOW_PROGRESS \
-    $CMAKE_TOOLCHAIN_CMD_FLAGS                                            \
     -DOPENCV_GENERATE_PKGCONFIG=ON                                        \
     -DENABLE_CONFIG_VERIFICATION=ON                                       \
     -DENABLE_PRECOMPILED_HEADERS=OFF                                      \
-    $CPU_DISPATCH_FLAGS                                                   \
     $OPENMP                                                               \
     -DWITH_MKL=ON                                                         \
     -DWITH_EIGEN=1                                                        \
@@ -159,6 +129,7 @@ cmake -LAH -G "Ninja"                                                     \
     -DPNG_PNG_INCLUDE_DIR=${PREFIX}/include                               \
     -DPROTOBUF_INCLUDE_DIR=${PREFIX}/include                              \
     -DPROTOBUF_LIBRARIES=${PREFIX}/lib                                    \
+    -DOPENCV_ENABLE_PKG_CONFIG=1                                          \
     $PYTHON_SET_FLAG                                                      \
     $PYTHON_SET_EXE                                                       \
     $PYTHON_SET_INC                                                       \
@@ -175,8 +146,4 @@ cmake -LAH -G "Ninja"                                                     \
     $PYTHON_UNSET_INSTALL                                                 \
     ..
 
-if [ "${MACHINE_STR:0:3}" == "ppc" ]; then 
-    # PPC seems to run out of memory quite often, build with fewer jobs.
-    NINJA_OPTS=-j2
-fi
-ninja install -v ${NINJA_OPTS}
+ninja install -v -j${CPU_COUNT}

conda/opencv/meta.yaml

@@ -42,19 +42,30 @@ source:
 
 build:
   number: 0
-  string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}_{{ PKG_BUILDNUM }}
+  string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
   run_exports:
     # https://abi-laboratory.pro/index.php?view=timeline&l=opencv
     # Things seem to change every patch versions, mostly the dnn module
-    - libopencv
+    - {{ pin_subpackage('libopencv', max_pin='x.x.x') }}
+  ignore_run_exports_from:
+    - python
 
 requirements:
   build:
+    - python {{ python }}
+                                    # [build_platform != target_platform]
+    - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+    - numpy
+    # numpy needed in build.sh whatever the platform [build_platform != target_platform]
     # Required to find ffpmeg
     - pkg-config                     # [not win]
     - m2-patch                       # [win]
     - cmake
     - ninja
+    - libgcc                        # [linux]
+    # libgomp conda-forge only      # [linux]
+    # ICE when enabling this
+    # - llvm-openmp                    # [osx]
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ cdt('mesa-libgl-devel') }}  # [linux]
@@ -79,6 +90,7 @@ requirements:
     - zlib {{ zlib }}
     - jpeg {{ jpeg }}
     - libtiff {{ libtiff }}
+    - libwebp {{ libwebp }}
     - harfbuzz {{ harfbuzz }}        # [unix]
     - libpng {{ libpng }}
     - ffmpeg {{ ffmpeg }}            # [not win]
@@ -86,9 +98,16 @@ requirements:
     - freetype {{ freetype }}
     - glib {{ glib }}                # [unix]
   run:
+    # https://github.com/conda-forge/harfbuzz-feedstock/pull/52
+    - harfbuzz                       # [unix]
     # Don't depend on python in the run section
     # py-opencv will depend on python
-    - {{ pin_compatible('harfbuzz') }} # [unix]
+    - 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') }}
 
 
 test:
@@ -170,15 +189,27 @@ test:
 outputs:
   - name: libopencv
   - name: opencv
+    build:
+      string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
     requirements:
+      host:
+        # Explicitely add a python requirement so that the hash changes between
+        # opencv    for pypy36 and python3.6
+        # similarly for pypy37 and python3.7
+        - python
       run:
         - {{ pin_subpackage('libopencv', exact=True) }}
         - {{ pin_subpackage('py-opencv', exact=True) }}
 
   - name: py-opencv
     build:
+      string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       run_exports:
-        - py-opencv
+        # Should we even have this???
+        # don't pin the python version so hard.
+        # Actually, I have found pretty good compatibility in the python
+        # package
+        - {{ pin_subpackage('py-opencv') }}
     requirements:
       # There is no build script, but I just want it to think
       # that it needs python and numpy at build time

conda_build_config.yaml

@@ -87,6 +87,8 @@ libpng:
   - 1.6.37
 libtiff:
   - 4.1.0
+libwebp:
+  - 1.1.0
 mkl:
   - 2019.4
 numpy: