From e96542d636b89d68d6bfa67a290eb2cca4a91c4f Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 4 Mar 2022 13:18:10 -0700 Subject: [PATCH] Build Changes (#4825) * Added various packages to the run section * Updated dependencies to be similar to dev --- recipe/meta.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ce56cc28ce..9f38086805 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ # This is the build number for the current version you are building. If this is the first build of # this version, the build number will be 0. It is incremented by 1 with every consecutive build of # the same version. -{% set build_number = "0" %} +{% set build_number = "1" %} package: name: isis @@ -46,6 +46,7 @@ build: requirements: build: - ale=0.8.6 + - aom - armadillo - boost=1.72 - boost-cpp=1.72 @@ -100,8 +101,9 @@ requirements: - swig - tnt - x264 + - x265 - xalan-c - - xerces-c=3 + - xerces-c - xorg-kbproto - xorg-libice - xorg-libsm @@ -111,7 +113,9 @@ requirements: run: - {{ pin_compatible('ale') }} + - {{ pin_compatible('aom', max_pin='x.x') }} - {{ pin_compatible('boost', max_pin='x.x') }} + - {{ pin_compatible('boost-cpp', max_pin='x.x') }} - blas - {{ pin_compatible('bullet', max_pin='x.x') }} - bz2file @@ -133,7 +137,11 @@ requirements: - {{ pin_compatible('jasper', max_pin='x.x') }} - {{ pin_compatible('jpeg', max_pin='x') }} - {{ pin_compatible('kakadu', max_pin='x') }} + - libcxx + - libopenblas + - {{ pin_compatible('libopencv', max_pin='x.x') }} - {{ pin_compatible('libpng') }} + - libtiff - mesalib - mysql - nanoflann @@ -149,6 +157,7 @@ requirements: - superlu - tnt - x264 + - x265 - {{ pin_compatible('xerces-c', max_pin='x.x.x') }} - xorg-kbproto - xorg-libice @@ -162,7 +171,7 @@ test: - test -e $PREFIX/include/isis/Isis.h - test -e $PREFIX/bin/isisimport - ISISROOT=$PREFIX isisimport -HELP - + about: home: https://github.com/USGS-Astrogeology/ISIS3 -- GitLab