From feee577ee83cd7d05c39f486d4d26148990cbef8 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 8 Jun 2020 19:31:08 +0200 Subject: [PATCH 1/4] Fix pkg-config boost entries for Ubuntu Focal (gazebo9) --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fc28981a1..d6fbc55d97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,6 +386,8 @@ else (build_errors) endif() # Remove the prefix lib (not always present, like in pthread) string (REPLACE "lib" "" bname "${bname}") + # Some boost versions add the Boost:: component toe cmake, need to change that to boost_ prefix + string (REPLACE "Boost::" "boost_" bname "${bname}") set (Boost_PKGCONFIG_LIBS "${Boost_PKGCONFIG_LIBS} ${bname}") endforeach(b) From a7f0b0fae10ec10cae3a2205e9471b64ea0fc1f2 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 15 Jul 2020 14:13:43 -0700 Subject: [PATCH 2/4] fix typo Signed-off-by: Steve Peters --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6fbc55d97..2f411a1bee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,7 +386,7 @@ else (build_errors) endif() # Remove the prefix lib (not always present, like in pthread) string (REPLACE "lib" "" bname "${bname}") - # Some boost versions add the Boost:: component toe cmake, need to change that to boost_ prefix + # Some boost versions add the Boost:: component to cmake, need to change that to boost_ prefix string (REPLACE "Boost::" "boost_" bname "${bname}") set (Boost_PKGCONFIG_LIBS "${Boost_PKGCONFIG_LIBS} ${bname}") endforeach(b) From d857951940b7c6b668bd2a702aa6c27645742307 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 15 Jul 2020 14:14:08 -0700 Subject: [PATCH 3/4] update changelog Signed-off-by: Steve Peters --- Changelog.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a36043c64d..ec07b7e0d0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,8 +5,14 @@ 1. Fix sensor update rate throttling when new sensors are spawned * [Pull request #2784](https://github.com/osrf/gazebo/pull/2784) +1. Fix crash when collision size is zero + * [Pull request #2768](https://github.com/osrf/gazebo/pull/2768) + 1. LensFlare: initialize OGRE compositors during plugin initialization - * [Pull request #2762](https://github.com/osrf/gazebo/pull/2762) + * [Pull request #2764](https://github.com/osrf/gazebo/pull/2764) + +1. Fix pkg-config boost entries for Ubuntu Focal + * [Pull request #2751](https://github.com/osrf/gazebo/pull/2751) 1. Fixes for ARM: FindSSE, TrackedVehiclePlugin and PluginInterfaceTest * [Pull request #2754](https://github.com/osrf/gazebo/pull/2754) From ce8359447f0db065b3db23e6e5a7020bc7785d52 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 15 Jul 2020 14:15:43 -0700 Subject: [PATCH 4/4] bump to 9.13.2 Signed-off-by: Steve Peters --- CMakeLists.txt | 2 +- Changelog.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f411a1bee..9e6dc60798 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set (GAZEBO_MINOR_VERSION 13) # The patch version may have been bumped for prerelease purposes; be sure to # check gazebo-release/ubuntu/debian/changelog@default to determine what the # next patch version should be for a regular release. -set (GAZEBO_PATCH_VERSION 1) +set (GAZEBO_PATCH_VERSION 2) set (GAZEBO_VERSION ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}) set (GAZEBO_VERSION_FULL ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}.${GAZEBO_PATCH_VERSION}) diff --git a/Changelog.md b/Changelog.md index ec07b7e0d0..9df6d42e43 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,8 @@ ## Gazebo 9.xx.x (202x-xx-xx) +## Gazebo 9.13.2 (202x-xx-xx) + 1. Fix sensor update rate throttling when new sensors are spawned * [Pull request #2784](https://github.com/osrf/gazebo/pull/2784)