From 4caa5efe07bf5eae0bdcab9faf1aec1072b14ff1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 2 Oct 2024 00:24:55 +0200 Subject: [PATCH 1/4] Remove CDTs and use regular conda packages for OpenGL support --- recipe/meta.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b8e9216..dc6779b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - 1071.patch build: - number: 0 + number: 1 outputs: - name: {{ cxx_name }} @@ -34,17 +34,6 @@ outputs: - ninja - cmake - pkg-config - # x11 - - {{ cdt('mesa-libgl-devel') }} # [unix and not (osx and arm64)] - - {{ cdt('mesa-dri-drivers') }} # [unix and not (osx and arm64)] - - {{ cdt('mesa-libegl-devel') }} # [linux] - - {{ cdt('libglvnd-devel') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - - {{ cdt('libxfixes') }} # [linux] - - {{ cdt('libxext') }} # [linux] - - {{ cdt('libxau') }} # [linux] host: - dlfcn-win32 # [win] - xorg-libx11 # [unix] @@ -56,6 +45,9 @@ outputs: - libgz-utils3 - ogre-next - ogre 1.10.* + - libgl-devel + - libopengl-devel + - libegl-devel run: - xorg-libx11 # [unix] - xorg-libxext # [unix] From 901e144ed72af108b7dd53b94b2b738bd37cce91 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 2 Oct 2024 00:43:38 +0200 Subject: [PATCH 2/4] Update meta.yaml --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc6779b..20be211 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,9 +45,9 @@ outputs: - libgz-utils3 - ogre-next - ogre 1.10.* - - libgl-devel - - libopengl-devel - - libegl-devel + - libgl-devel # [linux] + - libopengl-devel # [linux] + - libegl-devel # [linux] run: - xorg-libx11 # [unix] - xorg-libxext # [unix] From 8029f4b35110a3a122aa6a97095cabcbdaf83a26 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 2 Oct 2024 01:03:34 +0200 Subject: [PATCH 3/4] Update meta.yaml --- recipe/meta.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20be211..9585eaa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,22 +36,16 @@ outputs: - pkg-config host: - dlfcn-win32 # [win] - - xorg-libx11 # [unix] - - xorg-libxext # [unix] - - libglu # [linux] - libgz-math8 - libgz-common6 - libgz-plugin3 - libgz-utils3 - ogre-next - ogre 1.10.* - - libgl-devel # [linux] + - libglx-devel # [linux] - libopengl-devel # [linux] - libegl-devel # [linux] run: - - xorg-libx11 # [unix] - - xorg-libxext # [unix] - - libglu # [linux] - {{ pin_compatible('ogre', max_pin='x.x') }} test: commands: From 30e2808a848c7f2e93c3eda83898b384b3ffd7b9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 2 Oct 2024 08:30:57 +0200 Subject: [PATCH 4/4] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9585eaa..0518618 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,6 +35,7 @@ outputs: - cmake - pkg-config host: + - libglu # [linux] - dlfcn-win32 # [win] - libgz-math8 - libgz-common6