Rebuild for libxcb115 and disable 5.x ABI migrations and aom 3.7 (#219)

automerged PR by conda-forge/automerge-action
conda-forge · Nov 13, 2023 · 60b2d40 · 60b2d40
2 parents 34d9604 + fb5c324
commit 60b2d40
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 16 deletions.
diff --git a/.ci_support/linux_64_license_familygpl.yaml b/.ci_support/linux_64_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -28,6 +28,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -42,6 +46,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/linux_64_license_familylgpl.yaml b/.ci_support/linux_64_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -28,6 +28,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -42,6 +46,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -32,6 +32,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -46,6 +50,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -32,6 +32,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -46,6 +50,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/linux_ppc64le_license_familygpl.yaml b/.ci_support/linux_ppc64le_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -28,6 +28,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -42,6 +46,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/linux_ppc64le_license_familylgpl.yaml b/.ci_support/linux_ppc64le_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -28,6 +28,10 @@ gmp:
 - '6'
 gnutls:
 - '3.7'
+libiconv:
+- '1'
+libxcb:
+- '1.15'
 libxml2:
 - '2.11'
 license_family:
@@ -42,6 +46,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/migrations/aom37.yaml b/.ci_support/migrations/aom37.yaml
@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+aom:
+- '3.7'
+migrator_ts: 1699828306.2542195
diff --git a/.ci_support/migrations/libxcb115.yaml b/.ci_support/migrations/libxcb115.yaml
@@ -0,0 +1,9 @@
+migrator_ts: 1684619068
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+
+# Remember to add to global pinnings
+libxcb:
+  - '1.15'
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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -44,6 +44,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -44,6 +44,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -44,6 +44,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

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.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -44,6 +44,8 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/win_64_license_familygpl.yaml b/.ci_support/win_64_license_familygpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -16,6 +16,8 @@ fontconfig:
 - '2'
 freetype:
 - '2'
+libiconv:
+- '1'
 libxml2:
 - '2.11'
 license_family:
@@ -30,5 +32,7 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zlib:
 - '1.2'
diff --git a/.ci_support/win_64_license_familylgpl.yaml b/.ci_support/win_64_license_familylgpl.yaml
@@ -1,5 +1,5 @@
 aom:
-- '3.6'
+- '3.7'
 bzip2:
 - '1'
 c_compiler:
@@ -16,6 +16,8 @@ fontconfig:
 - '2'
 freetype:
 - '2'
+libiconv:
+- '1'
 libxml2:
 - '2.11'
 license_family:
@@ -30,5 +32,7 @@ x264:
 - 1!164.*
 x265:
 - '3.5'
+xz:
+- '5'
 zlib:
 - '1.2'
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,6 +1,3 @@
-bot:
-  abi_migration_branches:
-  - v5.x
 build_platform:
   linux_aarch64: linux_64
   linux_ppc64le: linux_64

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -17,7 +17,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 = 0 %}
+{% set build = 1 %}
 {% if license_family == 'gpl' %}
     {% set build = build + 100 %}
 {% endif %}