Rebuild for ffmpeg6 (#60)

automerged PR by conda-forge/automerge-action
conda-forge · May 17, 2023 · a67abfa · a67abfa
2 parents d6c6120 + 82a8ab4
commit a67abfa
Show file tree

Hide file tree

Showing 24 changed files with 327 additions and 58 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/.ci_support/linux_64_.yaml → .ci_support/linux_64_ffmpeg5.yaml b/.ci_support/linux_64_.yaml → .ci_support/linux_64_ffmpeg5.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 ffmpeg:

diff --git a/.ci_support/linux_64_ffmpeg6.yaml b/.ci_support/linux_64_ffmpeg6.yaml
@@ -0,0 +1,29 @@
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '12'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+ffmpeg:
+- '6'
+glib:
+- '2'
+libuuid:
+- '2'
+target_platform:
+- linux-64
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/.ci_support/linux_aarch64_.yaml → .ci_support/linux_aarch64_ffmpeg5.yaml b/.ci_support/linux_aarch64_.yaml → .ci_support/linux_aarch64_ffmpeg5.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 ffmpeg:

diff --git a/.ci_support/linux_aarch64_ffmpeg6.yaml b/.ci_support/linux_aarch64_ffmpeg6.yaml
@@ -0,0 +1,33 @@
+BUILD:
+- aarch64-conda_cos7-linux-gnu
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+cdt_arch:
+- aarch64
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '12'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+ffmpeg:
+- '6'
+glib:
+- '2'
+libuuid:
+- '2'
+target_platform:
+- linux-aarch64
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/.ci_support/linux_ppc64le_.yaml → .ci_support/linux_ppc64le_ffmpeg5.yaml b/.ci_support/linux_ppc64le_.yaml → .ci_support/linux_ppc64le_ffmpeg5.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos7
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
 ffmpeg:

diff --git a/.ci_support/linux_ppc64le_ffmpeg6.yaml b/.ci_support/linux_ppc64le_ffmpeg6.yaml
@@ -0,0 +1,29 @@
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '12'
+docker_image:
+- quay.io/condaforge/linux-anvil-ppc64le
+ffmpeg:
+- '6'
+glib:
+- '2'
+libuuid:
+- '2'
+target_platform:
+- linux-ppc64le
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/.ci_support/migrations/ffmpeg5.yaml b/.ci_support/migrations/ffmpeg5.yaml
diff --git a/.ci_support/migrations/ffmpeg6.yaml b/.ci_support/migrations/ffmpeg6.yaml
@@ -0,0 +1,8 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+ffmpeg:
+- '5'
+- '6'
+migrator_ts: 1684252387.6420875
diff --git a/.ci_support/osx_64_.yaml → .ci_support/osx_64_ffmpeg5.yaml b/.ci_support/osx_64_.yaml → .ci_support/osx_64_ffmpeg5.yaml
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 ffmpeg:
 - '5'
 glib:

diff --git a/.ci_support/osx_64_ffmpeg6.yaml b/.ci_support/osx_64_ffmpeg6.yaml
@@ -0,0 +1,27 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+c_compiler:
+- clang
+c_compiler_version:
+- '15'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '15'
+ffmpeg:
+- '6'
+glib:
+- '2'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+target_platform:
+- osx-64
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/.ci_support/osx_arm64_.yaml → .ci_support/osx_arm64_ffmpeg5.yaml b/.ci_support/osx_arm64_.yaml → .ci_support/osx_arm64_ffmpeg5.yaml
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 ffmpeg:
 - '5'
 glib:

diff --git a/.ci_support/osx_arm64_ffmpeg6.yaml b/.ci_support/osx_arm64_ffmpeg6.yaml
@@ -0,0 +1,27 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '11.0'
+c_compiler:
+- clang
+c_compiler_version:
+- '15'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '15'
+ffmpeg:
+- '6'
+glib:
+- '2'
+macos_machine:
+- arm64-apple-darwin20.0.0
+target_platform:
+- osx-arm64
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/.ci_support/win_64_.yaml → .ci_support/win_64_ffmpeg5.yaml b/.ci_support/win_64_.yaml → .ci_support/win_64_ffmpeg5.yaml
diff --git a/.ci_support/win_64_ffmpeg6.yaml b/.ci_support/win_64_ffmpeg6.yaml
@@ -0,0 +1,16 @@
+c_compiler:
+- vs2019
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- vs2019
+ffmpeg:
+- '6'
+glib:
+- '2'
+target_platform:
+- win-64
+tinyxml2:
+- '9'
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh