Merge pull request #348 from traversaro/patch-2

Ensure that vtk can be installed with both ffmpeg==6 and ffmpeg==7
conda-forge · Sep 23, 2024 · 0de1521 · 0de1521
2 parents 572ea00 + 3cda38b
commit 0de1521
Show file tree

Hide file tree

Showing 60 changed files with 125 additions and 119 deletions.
diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name

diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml
@@ -41,7 +41,7 @@ libnetcdf:
 libpng:
 - '1.6'
 libtiff:
-- '4.6'
+- '4.7'
 libuuid:
 - '2'
 libxcb:
@@ -73,7 +73,7 @@ tbb_devel:
 tk:
 - '8.6'
 vtk:
-- 9.2.6
+- 9.3.0
 zip_keys:
 - - c_stdlib_version
   - cdt_name