[bot-automerge] ogre v14.2.3 (#116)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 28, 2024 · 23292db · 23292db
2 parents c1e044b + ba67e53
commit 23292db
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 7 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/.ci_support/linux_64_numpy1.22.yaml b/.ci_support/linux_64_numpy1.22.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -33,5 +37,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_64_numpy1.23.yaml b/.ci_support/linux_64_numpy1.23.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -33,5 +37,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_aarch64_numpy1.22.yaml b/.ci_support/linux_aarch64_numpy1.22.yaml
@@ -8,6 +8,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -37,5 +41,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_aarch64_numpy1.23.yaml b/.ci_support/linux_aarch64_numpy1.23.yaml
@@ -8,6 +8,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -37,5 +41,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_ppc64le_numpy1.22.yaml b/.ci_support/linux_ppc64le_numpy1.22.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -33,5 +37,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_ppc64le_numpy1.23.yaml b/.ci_support/linux_ppc64le_numpy1.23.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -33,5 +37,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'
diff --git a/.ci_support/osx_64_numpy1.22.yaml b/.ci_support/osx_64_numpy1.22.yaml
@@ -10,6 +10,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.10'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_64_numpy1.23.yaml b/.ci_support/osx_64_numpy1.23.yaml
@@ -10,6 +10,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.10'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_numpy1.22.yaml b/.ci_support/osx_arm64_numpy1.22.yaml
@@ -8,6 +8,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_numpy1.23.yaml b/.ci_support/osx_arm64_numpy1.23.yaml
@@ -8,6 +8,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/win_64_numpy1.22.yaml b/.ci_support/win_64_numpy1.22.yaml
@@ -4,6 +4,8 @@ bullet_cpp:
 - '3.25'
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/win_64_numpy1.23.yaml b/.ci_support/win_64_numpy1.23.yaml
@@ -4,6 +4,8 @@ bullet_cpp:
 - '3.25'
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "ogre" %}
-{% set version = "14.2.2" %}
+{% set version = "14.2.3" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   - url: https://github.com/OGRECave/ogre/archive/v{{ version }}.tar.gz
-    sha256: 1566e2d59ae3a6b221b7fcf8652cc1b303e8bdd81eac3fcd176f744d79058e42
+    sha256: 797702591ffc7bbde8da876e4d6dcacb0905eb5c19f57fb7e623cd2b6079c394
     patches:
       - 0001-enable-pkg-config-for-Windows.patch  # [win]
       - 0002-osx-no-framework.patch  # [osx]