Merge pull request #221 from regro-cf-autotick-bot/rebuild-graphviz11…

…-0-1_h69e065 Rebuild for graphviz 11
conda-forge · Jun 16, 2024 · 6412ecc · 6412ecc
2 parents f230fc7 + 81a6766
commit 6412ecc
Show file tree

Hide file tree

Showing 26 changed files with 93 additions and 20 deletions.
diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
@@ -29,7 +29,7 @@ docker_image:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
@@ -29,7 +29,7 @@ docker_image:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
@@ -29,7 +29,7 @@ docker_image:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
@@ -29,7 +29,7 @@ docker_image:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
@@ -33,7 +33,7 @@ docker_image:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
@@ -33,7 +33,7 @@ docker_image:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
@@ -33,7 +33,7 @@ docker_image:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
@@ -33,7 +33,7 @@ docker_image:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/migrations/graphviz11.yaml b/.ci_support/migrations/graphviz11.yaml
@@ -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
diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
@@ -31,7 +31,7 @@ cxx_compiler_version:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 ffmpeg:
 - '6'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 ffmpeg:
 - '7'
 graphviz:
-- '9'
+- '11'
 hdf5:
 - 1.14.3
 libabseil:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/3373.patch b/recipe/3373.patch
@@ -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)
+     {
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -19,6 +19,7 @@ source:
       - 3368.patch
       - 3370.patch
       - 3380.patch
+      - 3373.patch
       - ffmpeg_5_6_fix.patch
 
 build: