Skip to content

Commit

Permalink
Merge pull request #22 from traversaro/traversaro-patch-1
Browse files Browse the repository at this point in the history 
Bump build number and rebuild against latest libavif on Windows
  • Loading branch information
@hmaarrfk
hmaarrfk authored May 29, 2024
2 parents 9235464 + 2ea0cd0 commit 5986c56
Show file tree
Hide file tree
Showing 23 changed files with 145 additions and 50 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

3 changes: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file

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

11 changes: 9 additions & 2 deletions .ci_support/linux_64_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -15,10 +19,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- gpl
target_platform:
- linux-64
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
11 changes: 9 additions & 2 deletions .ci_support/linux_64_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -15,10 +19,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
target_platform:
- linux-64
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
11 changes: 9 additions & 2 deletions .ci_support/linux_aarch64_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -19,10 +23,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- gpl
target_platform:
- linux-aarch64
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
11 changes: 9 additions & 2 deletions .ci_support/linux_aarch64_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -19,10 +23,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
target_platform:
- linux-aarch64
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
11 changes: 9 additions & 2 deletions .ci_support/linux_ppc64le_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -15,10 +19,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- gpl
target_platform:
- linux-ppc64le
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
11 changes: 9 additions & 2 deletions .ci_support/linux_ppc64le_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -15,10 +19,13 @@ dav1d:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
target_platform:
- linux-ppc64le
x265:
- '3.5'
zip_keys:
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/osx_64_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
aom:
- '3.7'
- '3.8'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +19,7 @@ cxx_compiler_version:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- gpl
macos_machine:
Expand Down
12 changes: 9 additions & 3 deletions .ci_support/osx_64_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
aom:
- '3.7'
- '3.8'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +19,7 @@ cxx_compiler_version:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
macos_machine:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/osx_arm64_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
aom:
- '3.7'
- '3.8'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +19,7 @@ cxx_compiler_version:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- gpl
macos_machine:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/osx_arm64_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
aom:
- '3.7'
- '3.8'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +19,7 @@ cxx_compiler_version:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
macos_machine:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/win_64_license_familygpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -9,7 +11,7 @@ cxx_compiler:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- gpl
target_platform:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/win_64_license_familylgpl.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
aom:
- '3.7'
- '3.8'
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -9,7 +11,7 @@ cxx_compiler:
dav1d:
- 1.2.1
libavif:
- 1.0.1
- '1'
license_family:
- lgpl
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file

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

25 changes: 23 additions & 2 deletions .gitignore
View file

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

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh
View file

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

Loading

0 comments on commit 5986c56

Please sign in to comment.