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

Rebuild for graphviz 11 #221

Merged
merged 4 commits into from
Jun 16, 2024
Merged

Rebuild for graphviz 11 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e39daa
Rebuild for graphviz 11
regro-cf-autotick-bot Jun 15, 2024
9afa922
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 15, 2024
0b28a32
Create 3373.patch
traversaro Jun 16, 2024
81a6766
Update meta.yaml
traversaro Jun 16, 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: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/graphviz11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for graphviz 11
kind: version
migration_number: 1
graphviz:
- '11'
migrator_ts: 1716148967.692182
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '6'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '7'
graphviz:
- '9'
- '11'
hdf5:
- 1.14.3
libabseil:
Expand Down
7 changes: 7 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.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

5 changes: 5 additions & 0 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.

45 changes: 45 additions & 0 deletions recipe/3373.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From 660ae15f4af1f5ea8d9d50d4a24e4d91a94f9c2d Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 20 Feb 2024 17:25:23 -0800
Subject: [PATCH] Fix build with graphviz 10.0

Replace TRUE with 1, since the TRUE macro has been removed.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
gazebo/gui/qgv/QGVSubGraph.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gazebo/gui/qgv/QGVSubGraph.cpp b/gazebo/gui/qgv/QGVSubGraph.cpp
index 51925aba30..c16b69d065 100644
--- a/gazebo/gui/qgv/QGVSubGraph.cpp
+++ b/gazebo/gui/qgv/QGVSubGraph.cpp
@@ -44,13 +44,13 @@ QString QGVSubGraph::name() const

QGVNode *QGVSubGraph::addNode(const QString &label)
{
- Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE);
+ Agnode_t *node = agnode(_sgraph->graph(), NULL, 1);
if (node == NULL)
{
qWarning()<<"Invalid sub node :"<<label;
return 0;
}
- agsubnode(_sgraph->graph(), node, TRUE);
+ agsubnode(_sgraph->graph(), node, 1);

QGVNode *item = new QGVNode(new QGVNodePrivate(node), _scene);
item->setLabel(label);
@@ -66,10 +66,10 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &_name, bool cluster)
if (cluster)
{
sgraph = agsubg(_sgraph->graph(),
- ("cluster_" + _name).toLocal8Bit().data(), TRUE);
+ ("cluster_" + _name).toLocal8Bit().data(), 1);
}
else
- sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), TRUE);
+ sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), 1);

if (sgraph == NULL)
{
1 change: 1 addition & 0 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ source:
- 3368.patch
- 3370.patch
- 3380.patch
- 3373.patch
- ffmpeg_5_6_fix.patch

build:
Expand Down