diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 1d95fd3..1865dcb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -14,6 +14,8 @@ cxx_compiler_version: - '7' docker_image: - condaforge/linux-anvil-comp7 +glib: +- '2.58' libuuid: - 2.32.1 pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3145e70..62dfbbd 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -12,6 +12,8 @@ cxx_compiler: - clangxx cxx_compiler_version: - '10' +glib: +- '2.58' libuuid: - 2.32.1 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 1d32a6f..3f897a0 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -2,6 +2,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +glib: +- '2.58' target_platform: - win-64 vc: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0832940..ba9e8ac 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - framework.patch # [osx] build: - number: 1 + number: 2 skip: true # [win and vc<14] run_exports: - {{ pin_subpackage(name, max_pin='x') }} @@ -32,11 +32,14 @@ requirements: - pkgconfig host: - libignition-math6 + - libignition-cmake2 - dlfcn-win32 # [win] - libuuid # [not win] - freeimage - gts - tinyxml2 + - glib + - ffmpeg run: - libignition-math6 - dlfcn-win32 # [win] @@ -44,6 +47,7 @@ requirements: - freeimage - gts - tinyxml2 + - ffmpeg test: commands: