Merge branch 'bob-devel' into 'master'

[bob-devel] Update with our ffmpeg with h264 support

See merge request bob/bob.conda!413

conda/beat-devel/meta.yaml

@@ -2,7 +2,7 @@
 {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
 package:
   name: beat-devel
-  version: 2019.04.17
+  version: 2019.04.18
 
 build:
   # the build number must be zero all the time.
@@ -15,7 +15,7 @@ build:
 requirements:
   host:
     - python {{ python }}
-    - bob-devel 2019.04.17
+    - bob-devel 2019.04.18
     - docker-py 3.6.0
     - flask 1.0.2
     - flask-cors 3.0.7

conda/bob-devel/meta.yaml

@@ -2,9 +2,9 @@
 {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
 package:
   name: bob-devel
-  version: 2019.04.17
-# please update the version of beat-devel and update bob-devel's version there
-# as well in the same merge request.
+  # please update the version of beat-devel and update bob-devel's version there
+  # as well in the same merge request.
+  version: 2019.04.18
 
 build:
   # the build number must be zero all the time.
@@ -74,6 +74,9 @@ requirements:
     - zc.recipe.egg 2.0.7
     # beat-devel direct dependencies that leak to bob-devel as indirect dependencies:
     - termcolor 1.1.0
+    # semi-supported dependencies (drop them if they conflict):
+    - dlib 19.7
+    - menpo 0.8.1
   run:
     - python
   run_constrained:
@@ -83,6 +86,14 @@ requirements:
   {% endif %}
   {% endfor %}
 
+test:
+  requires:
+    - ffmpeg
+  commands:
+    # we expect these features from ffmpeg:
+    - ffmpeg -codecs | grep "DEVI.S zlib"  # [unix]
+    - ffmpeg -codecs | grep "DEV.LS h264"  # [unix]
+
 about:
   home: http://www.idiap.ch/software/bob
   license: BSD 3-Clause

conda/ffmpeg/meta.yaml

@@ -56,7 +56,7 @@ test:
     - ffmpeg --help
     - ffmpeg -codecs | grep "DEVI.S zlib"  # [unix]
     # macOS h264 support comes from the VideoToolbox Framework I guess?
-    - ffmpeg -codecs | grep "DEV.LS h264"  # [osx]
+    - ffmpeg -codecs | grep "DEV.LS h264"  # [unix]
     # It is unclear to me why this is supported on macOS. Hmm.
     - ffmpeg -protocols | grep "https"     # [osx]
     # Verify dynamic libraries on all systems