From 09ba4fca2fa5e38b8000916af556e56688102f41 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Wed, 13 Jan 2021 13:27:15 -0800 Subject: [PATCH 01/11] add ign-rendering to feedstock Signed-off-by: John Shepherd --- .../libignition-rendering-recipe/meta.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 recipes/libignition-rendering-recipe/meta.yaml diff --git a/recipes/libignition-rendering-recipe/meta.yaml b/recipes/libignition-rendering-recipe/meta.yaml new file mode 100644 index 0000000000000..e7fb5a7c1c145 --- /dev/null +++ b/recipes/libignition-rendering-recipe/meta.yaml @@ -0,0 +1,55 @@ +{% set base_name = "libignition-rendering" %} +{% set version = "4.1.0" %} +{% set name = base_name + version.split('.')[0] %} + +package: + name: {{ name }} + version: {{ version }} + +source: + url: https://github.com/ignitionrobotics/ign-rendering/archive/ignition-rendering{{ version.split('.')[0] }}_{{ version }}.tar.gz + sha256: 465e858332d5b0e608888e9d62d08f779c7d99d0a51f2de7ba23ba640cdd4be4 + +build: + number: 0 + run_exports: + - {{ pin_subpackage(name, max_pin='x') }} + +requirements: + build: + - {{ compiler('cxx') }} + - {{ compiler('c') }} + - make # [not win] + - cmake + - pkg-config # [not win] + host: + - libignition-math6 >=6.6 + - libignition-common3 + - libignition-plugin1 + - ogre + run: + - libignition-math6 >=6.6 + - libignition-common3 + - libignition-plugin1 + - ogre + +test: + commands: + - test -f ${PREFIX}/include/ignition/rendering{{ version.split('.')[0] }}/ignition/rendering.hh # [not win] + - test -f ${PREFIX}/lib/libignition-rendering{{ version.split('.')[0] }}.so # [linux] + - test -f ${PREFIX}/lib/libignition-rendering{{ version.split('.')[0] }}.dylib # [osx] + - test -f ${PREFIX}/lib/cmake/ignition-rendering{{ version.split('.')[0] }}/ignition-rendering{{ version.split('.')[0] }}-config.cmake # [not win] + - if exist %PREFIX%\\Library\\include\\ignition\\rendering{{ version.split('.')[0] }}\\ignition\\rendering.hh (exit 0) else (exit 1) # [win] + - if exist $PREFIX$\\Library\\lib\\ignition-rendering{{ version.split('.')[0] }}.lib (exit 0) else (exit 1) # [win] + - if exist $PREFIX$\\Library\\bin\\ignition-rendering{{ version.split('.')[0] }}.dll (exit 0) else (exit 1) # [win] + - if exist %PREFIX%\\Library\\lib\\cmake\\ignition-rendering{{ version.split('.')[0] }}\\ignition-rendering{{ version.split('.')[0] }}-config.cmake (exit 0) else (exit 1) # [win] + +about: + home: https://github.com/ignitionrobotics/ign-rendering + license: Apache-2.0 + license_file: LICENSE + summary: Ignition Rendering + +extra: + recipe-maintainers: + - JShep1 From e42bce28ac3111ba51ae3c48cb344ad7798b7aca Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Wed, 13 Jan 2021 14:43:41 -0800 Subject: [PATCH 02/11] add build scripts Signed-off-by: John Shepherd --- recipes/libignition-rendering/bld.bat | 22 +++++++++++++++++++ recipes/libignition-rendering/build.sh | 14 ++++++++++++ .../meta.yaml | 0 3 files changed, 36 insertions(+) create mode 100644 recipes/libignition-rendering/bld.bat create mode 100644 recipes/libignition-rendering/build.sh rename recipes/{libignition-rendering-recipe => libignition-rendering}/meta.yaml (100%) diff --git a/recipes/libignition-rendering/bld.bat b/recipes/libignition-rendering/bld.bat new file mode 100644 index 0000000000000..847c8c2c1cfe9 --- /dev/null +++ b/recipes/libignition-rendering/bld.bat @@ -0,0 +1,22 @@ +mkdir build +cd build + +cmake ^ + -G "NMake Makefiles" ^ + -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^ + %SRC_DIR% +if errorlevel 1 exit 1 + +:: Build. +cmake --build . --config Release +if errorlevel 1 exit 1 + +:: Install. +cmake --build . --config Release --target install +if errorlevel 1 exit 1 + +:: Test. +ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION" +if errorlevel 1 exit 1 diff --git a/recipes/libignition-rendering/build.sh b/recipes/libignition-rendering/build.sh new file mode 100644 index 0000000000000..62928e8345996 --- /dev/null +++ b/recipes/libignition-rendering/build.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +mkdir build +cd build + +cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True + +cmake --build . --config Release +cmake --build . --config Release --target install +ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION" diff --git a/recipes/libignition-rendering-recipe/meta.yaml b/recipes/libignition-rendering/meta.yaml similarity index 100% rename from recipes/libignition-rendering-recipe/meta.yaml rename to recipes/libignition-rendering/meta.yaml From f63d1f2bd3c0846c6b499b344d741cf5e7975ed9 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Wed, 13 Jan 2021 16:57:40 -0800 Subject: [PATCH 03/11] add freeglut Signed-off-by: John Shepherd --- recipes/libignition-rendering/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index e7fb5a7c1c145..3b63381c2b2b6 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -22,6 +22,7 @@ requirements: - make # [not win] - cmake - pkg-config # [not win] + - freeglut # [not win] host: - libignition-math6 >=6.6 - libignition-common3 From 4ab628d1d7668b2c57fbe21799d57c0766bd1806 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Wed, 13 Jan 2021 20:09:14 -0800 Subject: [PATCH 04/11] add glew to deps Signed-off-by: John Shepherd --- recipes/libignition-rendering/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index 3b63381c2b2b6..1456834667106 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -23,6 +23,7 @@ requirements: - cmake - pkg-config # [not win] - freeglut # [not win] + - glew # [not win] host: - libignition-math6 >=6.6 - libignition-common3 From 0c2cee4451e193205105b9c42e642cb06c82f50e Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Wed, 13 Jan 2021 20:15:57 -0800 Subject: [PATCH 05/11] Add opengl Signed-off-by: John Shepherd --- recipes/libignition-rendering/meta.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index 1456834667106..8405350ead37c 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -19,17 +19,27 @@ requirements: build: - {{ compiler('cxx') }} - {{ compiler('c') }} + - {{ cdt('mesa-libgl-devel') }} # [unix] + - {{ cdt('mesa-dri-drivers') }} # [unix] + - {{ cdt('libselinux') }} # [linux] + - {{ cdt('libxdamage') }} # [linux] + - {{ cdt('libxxf86vm') }} # [linux] + - {{ cdt('libxfixes') }} # [linux] + - {{ cdt('libxext') }} # [linux] + - {{ cdt('libxau') }} # [linux] - make # [not win] - cmake - pkg-config # [not win] - - freeglut # [not win] - - glew # [not win] host: + - xorg-libx11 # [unix] + - xorg-libxext # [unix] - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 - ogre run: + - xorg-libx11 # [unix] + - xorg-libxext # [unix] - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 From b9b7e8cd0192f868df5935e8a69ef711314d94fc Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Thu, 21 Jan 2021 21:12:40 -0800 Subject: [PATCH 06/11] Add macOS req + exclude windows test Signed-off-by: John Shepherd --- recipes/libignition-rendering/bld.bat | 2 +- recipes/libignition-rendering/conda_build_config.yaml | 4 ++++ recipes/libignition-rendering/meta.yaml | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 recipes/libignition-rendering/conda_build_config.yaml diff --git a/recipes/libignition-rendering/bld.bat b/recipes/libignition-rendering/bld.bat index 847c8c2c1cfe9..6ddfb636dc56c 100644 --- a/recipes/libignition-rendering/bld.bat +++ b/recipes/libignition-rendering/bld.bat @@ -18,5 +18,5 @@ cmake --build . --config Release --target install if errorlevel 1 exit 1 :: Test. -ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION" +ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION|UNIT_RenderingIface_TEST" if errorlevel 1 exit 1 diff --git a/recipes/libignition-rendering/conda_build_config.yaml b/recipes/libignition-rendering/conda_build_config.yaml new file mode 100644 index 0000000000000..fe398bddb1afd --- /dev/null +++ b/recipes/libignition-rendering/conda_build_config.yaml @@ -0,0 +1,4 @@ +macos_min_version: # [osx] + - 10.14 # [osx] +MACOSX_DEPLOYMENT_TARGET: # [osx] + - 10.14 # [osx] diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index 8405350ead37c..9f23c15620e7c 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -19,6 +19,11 @@ requirements: build: - {{ compiler('cxx') }} - {{ compiler('c') }} + - cmake + - make # [not win] + - pkg-config # [not win] + + # x11 - {{ cdt('mesa-libgl-devel') }} # [unix] - {{ cdt('mesa-dri-drivers') }} # [unix] - {{ cdt('libselinux') }} # [linux] @@ -27,9 +32,6 @@ requirements: - {{ cdt('libxfixes') }} # [linux] - {{ cdt('libxext') }} # [linux] - {{ cdt('libxau') }} # [linux] - - make # [not win] - - cmake - - pkg-config # [not win] host: - xorg-libx11 # [unix] - xorg-libxext # [unix] From 9cf35d6c9b902c18c29c28eaa82617ae0f3be7a7 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Thu, 21 Jan 2021 21:28:55 -0800 Subject: [PATCH 07/11] add mac req Signed-off-by: John Shepherd --- recipes/libignition-rendering/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index 9f23c15620e7c..a881dc0fae537 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -46,6 +46,7 @@ requirements: - libignition-common3 - libignition-plugin1 - ogre + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: commands: From efebcd10f02a51800434d3e6e90fdad55b7ea5e5 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Thu, 21 Jan 2021 22:05:13 -0800 Subject: [PATCH 08/11] Add glx flags Signed-off-by: John Shepherd --- recipes/libignition-rendering/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/libignition-rendering/build.sh b/recipes/libignition-rendering/build.sh index 62928e8345996..c231dff5f010b 100644 --- a/recipes/libignition-rendering/build.sh +++ b/recipes/libignition-rendering/build.sh @@ -7,7 +7,9 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True \ + -DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY \ + -DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY cmake --build . --config Release cmake --build . --config Release --target install From f7ba53044473ba267988922eb3e8b9b69bbc41e1 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Thu, 21 Jan 2021 22:30:44 -0800 Subject: [PATCH 09/11] add libglu Signed-off-by: John Shepherd --- recipes/libignition-rendering/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index a881dc0fae537..647917580c2c8 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -35,6 +35,7 @@ requirements: host: - xorg-libx11 # [unix] - xorg-libxext # [unix] + - libglu # [linux] - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 @@ -42,6 +43,7 @@ requirements: run: - xorg-libx11 # [unix] - xorg-libxext # [unix] + - libglu # [linux] - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 From 75eb24bf4a641fcdf2d57cab8708f73b5a94dc9b Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Thu, 21 Jan 2021 22:54:13 -0800 Subject: [PATCH 10/11] disable renderingiface for unix Signed-off-by: John Shepherd --- recipes/libignition-rendering/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libignition-rendering/build.sh b/recipes/libignition-rendering/build.sh index c231dff5f010b..c346e67c986a5 100644 --- a/recipes/libignition-rendering/build.sh +++ b/recipes/libignition-rendering/build.sh @@ -13,4 +13,4 @@ cmake .. \ cmake --build . --config Release cmake --build . --config Release --target install -ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION" +ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION|UNIT_RenderingIface_TEST|check_UNIT_RenderingIface_TEST" From 5df9a9f8c76ad4180ae16bb13871f451eab094a2 Mon Sep 17 00:00:00 2001 From: John Shepherd Date: Fri, 22 Jan 2021 10:29:57 -0800 Subject: [PATCH 11/11] Add maintainers, update glx flag Signed-off-by: John Shepherd --- recipes/libignition-rendering/build.sh | 7 ++++--- recipes/libignition-rendering/meta.yaml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/libignition-rendering/build.sh b/recipes/libignition-rendering/build.sh index c346e67c986a5..b869806b9e92b 100644 --- a/recipes/libignition-rendering/build.sh +++ b/recipes/libignition-rendering/build.sh @@ -3,13 +3,14 @@ mkdir build cd build +export CFLAGS="${CFLAGS} -DGLX_GLXEXT_LEGACY" +export CXXFLAGS="${CXXFLAGS} -DGLX_GLXEXT_LEGACY" + cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True \ - -DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY \ - -DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True cmake --build . --config Release cmake --build . --config Release --target install diff --git a/recipes/libignition-rendering/meta.yaml b/recipes/libignition-rendering/meta.yaml index 647917580c2c8..92132089d800a 100644 --- a/recipes/libignition-rendering/meta.yaml +++ b/recipes/libignition-rendering/meta.yaml @@ -70,3 +70,5 @@ about: extra: recipe-maintainers: - JShep1 + - wolfv + - traversaro