Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bot-automerge] gz-rendering v9.0.0 #30

Merged
merged 6 commits into from
Sep 29, 2024
Merged

[bot-automerge] gz-rendering v9.0.0 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5039aec
updated v9.0.0
regro-cf-autotick-bot Sep 27, 2024
ffbf174
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and co…
regro-cf-autotick-bot Sep 27, 2024
7c4814e
Add v8 to abi_migration_branches
traversaro Sep 27, 2024
3f7d592
Update for gz-rendering9
traversaro Sep 27, 2024
64a34a2
Create 1071.patch
traversaro Sep 29, 2024
2ac5b15
Add missing dlfcn-win32 dependency on Windows
traversaro Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bot:
abi_migration_branches:
- 'v7'
- 'v8'
automerge: true
build_platform:
osx_arm64: osx_64
Expand Down
28 changes: 28 additions & 0 deletions recipe/1071.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From a3074544bd88627ac0060ce8d895eabc89bbe197 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Sun, 29 Sep 2024 20:58:27 +0200
Subject: [PATCH] Fix installation with GZ_ENABLE_RELOCATABLE_INSTALL=ON

By adding the missing DL dependency

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
---
CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96ce89131..bf7aa7098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,6 +154,11 @@ set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR
set(GZ_RENDERING_ENGINE_INSTALL_DIR
${CMAKE_INSTALL_PREFIX}/${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR})

+#--------------------------------------
+# Find DL if doing relocatable installation
+if (GZ_ENABLE_RELOCATABLE_INSTALL)
+ gz_find_package(DL REQUIRED)
+endif()

#--------------------------------------
# Find dependencies that we ignore for Visual Studio
15 changes: 9 additions & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set component_name = "rendering" %}
{% set repo_name = "gz-" + component_name %}
{% set version = "8.2.0" %}
{% set version = "9.0.0" %}
{% set major_version = version.split('.')[0] %}
{% set name = repo_name + major_version %}
{% set component_version = component_name + major_version %}
Expand All @@ -12,7 +12,9 @@ package:

source:
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz
sha256: d7782709d393841e5263a085ef3d0727bd249d5d430dc1f149d15acaa1c03efd
sha256: 3eb56a495c61e9274e24421f54ee074b01745c8d02f8f0e877aa346d562a3d32
patches:
- 1071.patch

build:
number: 0
Expand Down Expand Up @@ -44,13 +46,14 @@ outputs:
- {{ cdt('libxext') }} # [linux]
- {{ cdt('libxau') }} # [linux]
host:
- dlfcn-win32 # [win]
- xorg-libx11 # [unix]
- xorg-libxext # [unix]
- libglu # [linux]
- libgz-math7
- libgz-common5
- libgz-plugin2
- libgz-utils2
- libgz-math8
- libgz-common6
- libgz-plugin3
- libgz-utils3
- ogre-next
- ogre 1.10.*
run:
Expand Down