Merge pull request #34 from Tobias-Fischer/arm1.10

Arm migration 1.10 branch

.ci_support/linux_64_.yaml

@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '9'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,13 +11,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 freetype:
 - '2'
 openexr:
-- 2.5.1
+- '2.5'
 pin_run_as_build:
   freetype:
     max_pin: x
@@ -28,5 +28,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - cdt_name
+  - docker_image
 zlib:
 - '1.2'

.ci_support/linux_aarch64_.yaml

@@ -0,0 +1,36 @@
+BUILD:
+- aarch64-conda_cos7-linux-gnu
+c_compiler:
+- gcc
+c_compiler_version:
+- '9'
+cdt_arch:
+- aarch64
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '9'
+docker_image:
+- quay.io/condaforge/linux-anvil-aarch64
+freetype:
+- '2'
+openexr:
+- '2.5'
+pin_run_as_build:
+  freetype:
+    max_pin: x
+  zlib:
+    max_pin: x.x
+target_platform:
+- linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+zlib:
+- '1.2'

.ci_support/linux_ppc64le_.yaml

@@ -0,0 +1,32 @@
+c_compiler:
+- gcc
+c_compiler_version:
+- '9'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '9'
+docker_image:
+- quay.io/condaforge/linux-anvil-ppc64le
+freetype:
+- '2'
+openexr:
+- '2.5'
+pin_run_as_build:
+  freetype:
+    max_pin: x
+  zlib:
+    max_pin: x.x
+target_platform:
+- linux-ppc64le
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+zlib:
+- '1.2'

.ci_support/osx_64_.yaml

@@ -3,21 +3,21 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '10'
+- '11'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '10'
+- '11'
 freetype:
 - '2'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openexr:
-- 2.5.1
+- '2.5'
 pin_run_as_build:
   freetype:
     max_pin: x

.ci_support/win_64_.yaml

@@ -9,15 +9,13 @@ cxx_compiler:
 freetype:
 - '2'
 openexr:
-- 2.5.1
+- '2.5'
 pin_run_as_build:
   freetype:
     max_pin: x
   zlib:
     max_pin: x.x
 target_platform:
 - win-64
-vc:
-- '14'
 zlib:
 - '1.2'

conda-forge.yml

@@ -1 +1,2 @@
 conda_forge_output_validation: true
+provider: {linux_aarch64: default, linux_ppc64le: default}

recipe/build.sh

@@ -3,6 +3,13 @@
 mkdir build
 cd build
 
+# This is needed as otherwise the log limit exceeds on Travis
+if [ ${target_platform} == "linux-ppc64le" ]; then
+  WARNING_FLAGS=-DCMAKE_CXX_FLAGS="-Wno-deprecated-copy"
+else
+  WARNING_FLAGS=
+fi
+
 cmake .. \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_PREFIX_PATH=$PREFIX \
@@ -19,7 +26,8 @@ cmake .. \
       -DOGRE_INSTALL_PDB=FALSE \
       -DOGRE_RESOURCEMANAGER_STRICT=0 \
       -DOGRE_CONFIG_THREAD_PROVIDER="std" \
-      -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=0
+      -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=0 \
+      ${WARNING_FLAGS}
 
 make -j${CPU_COUNT}
 make install

recipe/meta.yaml

@@ -13,8 +13,7 @@ source:
       - 0002-osx-no-framework.patch  # [osx]
 
 build:
-  number: 6
-  skip: true  # [win and vc<14]
+  number: 7
   run_exports:
     - {{ pin_subpackage('ogre', max_pin='x.x') }}
 
@@ -43,8 +42,8 @@ requirements:
     - freeimage
     - openexr
     - sdl2
-    - swig         # [unix]
-    - mono         # [unix]
+    - swig         # [unix and not aarch64 and not ppc64le]
+    - mono         # [unix and not aarch64 and not ppc64le]
   run:
     - xorg-libx11  # [unix]
     - xorg-libxaw  # [unix]
@@ -55,7 +54,7 @@ requirements:
     - freeimage
     - openexr
     - sdl2
-    - swig         # [unix]
+    - swig         # [unix and not aarch64 and not ppc64le]
 
 test:
   commands: