From a45c57b516cbb0fdc8c01a9f1cc3dc5942b6f221 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 5 Nov 2020 08:28:09 +1000 Subject: [PATCH 1/5] glib is now required as a dependency of gts --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0832940..643be3d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,6 +37,7 @@ requirements: - freeimage - gts - tinyxml2 + - glib run: - libignition-math6 - dlfcn-win32 # [win] From 81ab4dc199062cc334419628f4e6e185f34b809d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 5 Nov 2020 08:28:57 +1000 Subject: [PATCH 2/5] Up build num --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 643be3d..b18787d 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') }} From 0902e3f728bbff9bcd93a4bb0b48f222454827bf Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Wed, 4 Nov 2020 22:31:31 +0000 Subject: [PATCH 3/5] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and conda-forge-pinning 2020.11.04.10.36.34 --- .ci_support/linux_64_.yaml | 2 ++ .ci_support/osx_64_.yaml | 2 ++ .ci_support/win_64_.yaml | 2 ++ 3 files changed, 6 insertions(+) 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: From 5dfaa7f64f1ce8415763f93a2174591d2dc3843d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 5 Nov 2020 08:50:16 +1000 Subject: [PATCH 4/5] Test build with ffmpeg /cc @traversaro --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b18787d..fe87d90 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,7 @@ requirements: - gts - tinyxml2 - glib + - ffmpeg run: - libignition-math6 - dlfcn-win32 # [win] @@ -45,6 +46,7 @@ requirements: - freeimage - gts - tinyxml2 + - ffmpeg test: commands: From df6e29c898cabe98f54265a6d216f3ece4e8c877 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 6 Nov 2020 07:42:41 +1000 Subject: [PATCH 5/5] Fix #16 Add direct dependency on ignition-cmake2 cc @traversaro --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe87d90..ba9e8ac 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ requirements: - pkgconfig host: - libignition-math6 + - libignition-cmake2 - dlfcn-win32 # [win] - libuuid # [not win] - freeimage