Rebuild for aom36 (#212)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 2, 2023 · fd964fd · fd964fd
2 parents ee67ff7 + e82b6d2
commit fd964fd
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 84 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_license_familygpl.yaml b/.ci_support/linux_64_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/linux_64_license_familylgpl.yaml b/.ci_support/linux_64_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/linux_aarch64_license_familygpl.yaml b/.ci_support/linux_aarch64_license_familygpl.yaml
@@ -1,7 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/linux_aarch64_license_familylgpl.yaml b/.ci_support/linux_aarch64_license_familylgpl.yaml
@@ -1,7 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/linux_ppc64le_license_familygpl.yaml b/.ci_support/linux_ppc64le_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/linux_ppc64le_license_familylgpl.yaml b/.ci_support/linux_ppc64le_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/migrations/svt_av1170.yaml → .ci_support/migrations/aom36.yaml b/.ci_support/migrations/svt_av1170.yaml → .ci_support/migrations/aom36.yaml
@@ -2,6 +2,6 @@ __migrator:
   build_number: 1
   kind: version
   migration_number: 1
-migrator_ts: 1692982595.5820258
-svt_av1:
-- 1.7.0
+aom:
+- '3.6'
+migrator_ts: 1675830265.5616975
diff --git a/.ci_support/migrations/libxml2211.yaml b/.ci_support/migrations/libxml2211.yaml
diff --git a/.ci_support/osx_64_license_familygpl.yaml b/.ci_support/osx_64_license_familygpl.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/osx_64_license_familylgpl.yaml b/.ci_support/osx_64_license_familylgpl.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/osx_arm64_license_familygpl.yaml b/.ci_support/osx_arm64_license_familygpl.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/osx_arm64_license_familylgpl.yaml b/.ci_support/osx_arm64_license_familylgpl.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/win_64_license_familygpl.yaml b/.ci_support/win_64_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.ci_support/win_64_license_familylgpl.yaml b/.ci_support/win_64_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.5'
+- '3.6'
 bzip2:
 - '1'
 c_compiler:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -19,7 +19,7 @@ source:
     # https://github.com/conda-forge/ffmpeg-feedstock/pull/193#issuecomment-1484476264
     - patches/0001-Revert-compat-Use-instead-of-for-rc.exe-options.patch
 
-{% set build = 4 %}
+{% set build = 5 %}
 {% if license_family == 'gpl' %}
     {% set build = build + 100 %}
 {% endif %}