From 057cfbee06cd46e467e15c678677aa2837c6be38 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Sat, 11 Nov 2023 21:19:17 +0000
Subject: [PATCH 1/4] Rebuild for libxcb115

---
 .ci_support/migrations/libxcb115.yaml | 9 +++++++++
 recipe/meta.yaml                      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .ci_support/migrations/libxcb115.yaml

diff --git a/.ci_support/migrations/libxcb115.yaml b/.ci_support/migrations/libxcb115.yaml
new file mode 100644
index 00000000..47a46f97
--- /dev/null
+++ 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/recipe/meta.yaml b/recipe/meta.yaml
index 0224890a..daf25e42 100644
--- 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 %}

From 6313cd8ce11a16741fcb4cc7ba5b3bd745b7ffc2 Mon Sep 17 00:00:00 2001
From: Mark Harfouche <mark.harfouche@gmail.com>
Date: Sat, 11 Nov 2023 18:56:42 -0500
Subject: [PATCH 2/4] remove 5.x abi migration branch

---
 conda-forge.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conda-forge.yml b/conda-forge.yml
index 485d70fb..3bb5bb52 100644
--- 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

From c3847366062c1ce8fd70de5d198334166da83258 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Sun, 12 Nov 2023 23:59:45 +0000
Subject: [PATCH 3/4] Rebuild for aom37

---
 .ci_support/migrations/aom37.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .ci_support/migrations/aom37.yaml

diff --git a/.ci_support/migrations/aom37.yaml b/.ci_support/migrations/aom37.yaml
new file mode 100644
index 00000000..64905ca0
--- /dev/null
+++ 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

From fb5c3240c7a02c24f38727cabcb5ccb5f1044bb3 Mon Sep 17 00:00:00 2001
From: Mark Harfouche <mark.harfouche@gmail.com>
Date: Sun, 12 Nov 2023 19:29:24 -0500
Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 3.27.0, conda-smithy
 3.28.0, and conda-forge-pinning 2023.11.12.22.52.30

---
 .ci_support/linux_64_license_familygpl.yaml       | 8 +++++++-
 .ci_support/linux_64_license_familylgpl.yaml      | 8 +++++++-
 .ci_support/linux_aarch64_license_familygpl.yaml  | 8 +++++++-
 .ci_support/linux_aarch64_license_familylgpl.yaml | 8 +++++++-
 .ci_support/linux_ppc64le_license_familygpl.yaml  | 8 +++++++-
 .ci_support/linux_ppc64le_license_familylgpl.yaml | 8 +++++++-
 .ci_support/osx_64_license_familygpl.yaml         | 4 +++-
 .ci_support/osx_64_license_familylgpl.yaml        | 4 +++-
 .ci_support/osx_arm64_license_familygpl.yaml      | 4 +++-
 .ci_support/osx_arm64_license_familylgpl.yaml     | 4 +++-
 .ci_support/win_64_license_familygpl.yaml         | 6 +++++-
 .ci_support/win_64_license_familylgpl.yaml        | 6 +++++-
 12 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/.ci_support/linux_64_license_familygpl.yaml b/.ci_support/linux_64_license_familygpl.yaml
index deececce..7a6d284b 100644
--- 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
index c2521c4c..271dcb34 100644
--- 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
index 7c42b364..113c19ad 100644
--- 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
index 76d0bcac..b6f7970b 100644
--- 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
index 148439d7..77522a79 100644
--- 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
index f0a84430..0d7f1858 100644
--- 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/osx_64_license_familygpl.yaml b/.ci_support/osx_64_license_familygpl.yaml
index d39c6455..91f5db3d 100644
--- 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
index d3fd6f29..85ab0e1b 100644
--- 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
index aac27809..9095faa7 100644
--- 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
index b20c3051..8cd61d90 100644
--- 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
index ae433bd7..3e30a4b7 100644
--- 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
index d7f3e640..d85327a9 100644
--- 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'