Skip to content

Commit

Permalink
Rebuild for aom 3.8 (#231)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Jan 31, 2024
2 parents 04236a8 + b328d4c commit 8c10036
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/aom38.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for aom 3.8
kind: version
migration_number: 1
aom:
- '3.8'
migrator_ts: 1706659535.1517274
2 changes: 1 addition & 1 deletion .ci_support/osx_64_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_license_familygpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_license_familylgpl.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aom:
- '3.7'
- '3.8'
bzip2:
- '1'
c_compiler:
Expand Down
4 changes: 2 additions & 2 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 2 %}
{% set build = 3 %}
{% if license_family == 'gpl' %}
{% set build = build + 100 %}
{% endif %}
Expand Down

0 comments on commit 8c10036

Please sign in to comment.