Merge pull request #363 from traversaro/patch-5

Rebuild for protobuf423 with additional fixes
conda-forge · Jun 27, 2023 · cc19341 · cc19341
2 parents 9a5eac2 + 9effa89
commit cc19341
Show file tree

Hide file tree

Showing 153 changed files with 5,541 additions and 432 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...mpeg5numpy1.21python3.10.____cpython.yaml → ...f3.21numpy1.21python3.10.____cpython.yaml b/...mpeg5numpy1.21python3.10.____cpython.yaml → ...f3.21numpy1.21python3.10.____cpython.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack:

diff --git a/...fmpeg5numpy1.21python3.8.____73_pypy.yaml → ...uf3.21numpy1.21python3.8.____73_pypy.yaml b/...fmpeg5numpy1.21python3.8.____73_pypy.yaml → ...uf3.21numpy1.21python3.8.____73_pypy.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack:

diff --git a/...fmpeg5numpy1.21python3.8.____cpython.yaml → ...uf3.21numpy1.21python3.8.____cpython.yaml b/...fmpeg5numpy1.21python3.8.____cpython.yaml → ...uf3.21numpy1.21python3.8.____cpython.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack:

diff --git a/...fmpeg5numpy1.21python3.9.____73_pypy.yaml → ...uf3.21numpy1.21python3.9.____73_pypy.yaml b/...fmpeg5numpy1.21python3.9.____73_pypy.yaml → ...uf3.21numpy1.21python3.9.____73_pypy.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack:

diff --git a/...fmpeg5numpy1.21python3.9.____cpython.yaml → ...uf3.21numpy1.21python3.9.____cpython.yaml b/...fmpeg5numpy1.21python3.9.____cpython.yaml → ...uf3.21numpy1.21python3.9.____cpython.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack:

diff --git a/...mpeg5numpy1.23python3.11.____cpython.yaml → ...f3.21numpy1.23python3.11.____cpython.yaml b/...mpeg5numpy1.23python3.11.____cpython.yaml → ...f3.21numpy1.23python3.11.____cpython.yaml
@@ -23,11 +23,13 @@ glib:
 harfbuzz:
 - '7'
 hdf5:
-- 1.14.0
+- 1.14.1
 jasper:
 - '4'
 libcblas:
 - 3.9 *netlib
+libiconv:
+- '1'
 libjpeg_turbo:
 - 2.1.5
 liblapack: