Merge pull request #29 from akrherz/updates

build 1.19.5
conda-forge · Dec 27, 2024 · 0df1fd5 · 0df1fd5
2 parents 0762e07 + 83fc731
commit 0df1fd5
Show file tree

Hide file tree

Showing 20 changed files with 150 additions and 119 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
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
@@ -5,19 +5,19 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -26,6 +26,3 @@ target_platform:
 - linux-64
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_license_familylgpl.yaml b/.ci_support/linux_64_license_familylgpl.yaml
@@ -5,19 +5,19 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -26,6 +26,3 @@ target_platform:
 - linux-64
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_aarch64_license_familygpl.yaml b/.ci_support/linux_aarch64_license_familygpl.yaml
@@ -1,27 +1,23 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 aom:
 - '3.9'
 c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -30,6 +26,3 @@ target_platform:
 - linux-aarch64
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_aarch64_license_familylgpl.yaml b/.ci_support/linux_aarch64_license_familylgpl.yaml
@@ -1,27 +1,23 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 aom:
 - '3.9'
 c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -30,6 +26,3 @@ target_platform:
 - linux-aarch64
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_ppc64le_license_familygpl.yaml b/.ci_support/linux_ppc64le_license_familygpl.yaml
@@ -5,19 +5,19 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -26,6 +26,3 @@ target_platform:
 - linux-ppc64le
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_ppc64le_license_familylgpl.yaml b/.ci_support/linux_ppc64le_license_familylgpl.yaml
@@ -5,19 +5,19 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dav1d:
 - 1.2.1
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 libavif:
 - '1'
 license_family:
@@ -26,6 +26,3 @@ target_platform:
 - linux-ppc64le
 x265:
 - '3.5'
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/osx_64_license_familygpl.yaml b/.ci_support/osx_64_license_familygpl.yaml
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '18'
 dav1d:
 - 1.2.1
 libavif:

diff --git a/.ci_support/osx_64_license_familylgpl.yaml b/.ci_support/osx_64_license_familylgpl.yaml
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '18'
 dav1d:
 - 1.2.1
 libavif:

diff --git a/.ci_support/osx_arm64_license_familygpl.yaml b/.ci_support/osx_arm64_license_familygpl.yaml
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '18'
 dav1d:
 - 1.2.1
 libavif:

diff --git a/.ci_support/osx_arm64_license_familylgpl.yaml b/.ci_support/osx_arm64_license_familylgpl.yaml
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '18'
 dav1d:
 - 1.2.1
 libavif:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ channel_targets: @@
     cxx_compiler:
     - clangxx
     cxx_compiler_version:
-    - '16'
+    - '18'
     dav1d:
     - 1.2.1
     libavif:
@@ Expand Down @@