diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index 981385d..55a5e42 100644 --- 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 index efddc58..d5f249c 100644 --- 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 index 08b3204..8358c3e 100644 --- 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 index ac3be72..e9edfa2 100644 --- 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 index 8ec0477..678a603 100644 --- 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 index f68409a..7e29025 100644 --- 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 index e14379c..25d018b 100644 --- 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 index 037ecf2..6a2dca5 100644 --- 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 new file mode 100644 index 0000000..4a46fc4 --- /dev/null +++ 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 index 41e1747..c3af9ab 100644 --- 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 index 15ad318..8081376 100644 --- 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 index 7700fbd..0884a6b 100644 --- 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 index 49f2564..ba2b790 100644 --- 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 index fa72597..5fdc8a8 100644 --- 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 index 18af7b3..b88bc42 100644 --- 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 index 3670d00..5a2fbfd 100644 --- 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 index ff17355..af9ae82 100644 --- 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 index f3147e8..097c9e0 100644 --- 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 index fc9eda2..3cbf60f 100644 --- 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 index cd8f792..b575541 100644 --- 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 index b0776a7..2619b19 100644 --- 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 index f42ebe5..0816512 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/recipe/3373.patch b/recipe/3373.patch new file mode 100644 index 0000000..f3ab5eb --- /dev/null +++ b/recipe/3373.patch @@ -0,0 +1,45 @@ +From 660ae15f4af1f5ea8d9d50d4a24e4d91a94f9c2d Mon Sep 17 00:00:00 2001 +From: Steve Peters +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 +--- + 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 :"<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 index 439ca4a..079ea99 100644 --- 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: