Merge pull request #41 from Tobias-Fischer/Tobias-Fischer-patch-1

Apply patches on Unix as well
conda-forge · Nov 30, 2020 · 50ca4c9 · 50ca4c9
2 parents ba7ae47 + 46dd248
commit 50ca4c9
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/.ci_support/linux_64_boost_cpp1.72.0.yaml b/.ci_support/linux_64_boost_cpp1.72.0.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '9'
 docker_image:
 - quay.io/condaforge/linux-anvil-comp7
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -29,6 +31,8 @@ pin_run_as_build:
     max_pin: x.x.x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   libuuid:

diff --git a/.ci_support/linux_64_boost_cpp1.74.0.yaml b/.ci_support/linux_64_boost_cpp1.74.0.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '9'
 docker_image:
 - quay.io/condaforge/linux-anvil-comp7
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -29,6 +31,8 @@ pin_run_as_build:
     max_pin: x.x.x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   libuuid:

diff --git a/.ci_support/osx_64_boost_cpp1.72.0.yaml b/.ci_support/osx_64_boost_cpp1.72.0.yaml
@@ -18,6 +18,8 @@ cxx_compiler:
 - clangxx
 cxx_compiler_version:
 - '11'
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -33,6 +35,8 @@ pin_run_as_build:
     max_pin: x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   qt:

diff --git a/.ci_support/osx_64_boost_cpp1.74.0.yaml b/.ci_support/osx_64_boost_cpp1.74.0.yaml
@@ -18,6 +18,8 @@ cxx_compiler:
 - clangxx
 cxx_compiler_version:
 - '11'
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -33,6 +35,8 @@ pin_run_as_build:
     max_pin: x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   qt:

diff --git a/.ci_support/win_64_boost_cpp1.72.0.yaml b/.ci_support/win_64_boost_cpp1.72.0.yaml
@@ -10,6 +10,8 @@ curl:
 - '7'
 cxx_compiler:
 - vs2017
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -19,6 +21,8 @@ pin_run_as_build:
     max_pin: x.x.x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   qt:

diff --git a/.ci_support/win_64_boost_cpp1.74.0.yaml b/.ci_support/win_64_boost_cpp1.74.0.yaml
@@ -10,6 +10,8 @@ curl:
 - '7'
 cxx_compiler:
 - vs2017
+ffmpeg:
+- '4.3'
 libcurl:
 - '7'
 libprotobuf:
@@ -19,6 +21,8 @@ pin_run_as_build:
     max_pin: x.x.x
   curl:
     max_pin: x
+  ffmpeg:
+    max_pin: x.x
   libcurl:
     max_pin: x
   qt:

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,12 +10,12 @@ source:
     sha256: b3c14fc1a123be2992b880efa11d362d3d06c77d8c9624a14c487357ec7623f1
     patches:
       - fix_build.patch  # [unix]
-      - use-external-libs-config.patch  # [win]
-      - normalize-ogre-path.patch  # [win]
+      - use-external-libs-config.patch
+      - normalize-ogre-path.patch
       - cmake_129_workaround.patch  # [unix]
 
 build:
-  number: 1
+  number: 2
   skip: false
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}