From 1a2fbac7a4f73f9999a36f6d9640e6bb2afbcfd4 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 13 Jan 2022 17:30:08 -0800
Subject: [PATCH 1/6] Revert boost/bind.hpp changes in header files

Changing the includes can break downstream software,
so let's revert this for now.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 gazebo/common/MovingWindowFilter.hh | 2 +-
 gazebo/common/WeakBind.hh           | 2 +-
 gazebo/transport/Connection.hh      | 2 +-
 gazebo/transport/Node.hh            | 2 +-
 gazebo/transport/TopicManager.hh    | 2 +-
 gazebo/transport/TransportIface.hh  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gazebo/common/MovingWindowFilter.hh b/gazebo/common/MovingWindowFilter.hh
index b4092e878d..87b54921ab 100644
--- a/gazebo/common/MovingWindowFilter.hh
+++ b/gazebo/common/MovingWindowFilter.hh
@@ -23,7 +23,7 @@
 #include <map>
 
 #include <boost/function.hpp>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
diff --git a/gazebo/common/WeakBind.hh b/gazebo/common/WeakBind.hh
index 58662e6761..b406138e6c 100644
--- a/gazebo/common/WeakBind.hh
+++ b/gazebo/common/WeakBind.hh
@@ -19,7 +19,7 @@
 #define GAZEBO_COMMON_WEAKBIND_HH_
 
 #include <boost/shared_ptr.hpp>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 
 namespace gazebo
 {
diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh
index 0e7d88a32e..bb48a73bfc 100644
--- a/gazebo/transport/Connection.hh
+++ b/gazebo/transport/Connection.hh
@@ -21,7 +21,7 @@
 #include <google/protobuf/message.h>
 
 #include <boost/asio.hpp>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh
index b7d37f7cb1..bf5bd96258 100644
--- a/gazebo/transport/Node.hh
+++ b/gazebo/transport/Node.hh
@@ -19,7 +19,7 @@
 #define GAZEBO_TRANSPORT_NODE_HH_
 
 #include <tbb/task.h>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <map>
 #include <list>
diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh
index bcbe4a7dd6..7714e5daf7 100644
--- a/gazebo/transport/TopicManager.hh
+++ b/gazebo/transport/TopicManager.hh
@@ -17,7 +17,7 @@
 #ifndef GAZEBO_TRANSPORT_TOPICMANAGER_HH_
 #define GAZEBO_TRANSPORT_TOPICMANAGER_HH_
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <map>
 #include <list>
diff --git a/gazebo/transport/TransportIface.hh b/gazebo/transport/TransportIface.hh
index c6a6b77c86..e860997120 100644
--- a/gazebo/transport/TransportIface.hh
+++ b/gazebo/transport/TransportIface.hh
@@ -17,7 +17,7 @@
 #ifndef _GAZEBO_TRANSPORTIFACE_HH_
 #define _GAZEBO_TRANSPORTIFACE_HH_
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <string>
 #include <list>
 #include <map>

From 5edf5a3120ac578b774737989e183cf6b231182c Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 13 Jan 2022 17:33:45 -0800
Subject: [PATCH 2/6] Bump to 11.10.1

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt | 2 +-
 Changelog.md   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0239b7ea99..e0d1280891 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ set (GAZEBO_MINOR_VERSION 10)
 # 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 0)
+set (GAZEBO_PATCH_VERSION 1)
 
 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 1c29adf6e9..278e0b6088 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,10 @@
 ## Gazebo 11
 
+## Gazebo 11.10.1 (2022-01-13)
+
+1. Revert boost/bind.hpp changes in header files
+    * [Pull request #3160](https://github.com/ignitionrobotics/gazebo/pull/3160)
+
 ## Gazebo 11.10.0 (2022-01-12)
 
 1. Use boost/bind/bind.hpp to fix warnings on Arch Linux

From 06117c4d66c2eec4e00f3242478ff5b6af5c9c8b Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 13 Jan 2022 21:54:48 -0800
Subject: [PATCH 3/6] Fix Changelog links

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 Changelog.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 278e0b6088..20057d2313 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,34 +3,34 @@
 ## Gazebo 11.10.1 (2022-01-13)
 
 1. Revert boost/bind.hpp changes in header files
-    * [Pull request #3160](https://github.com/ignitionrobotics/gazebo/pull/3160)
+    * [Pull request #3160](https://github.com/osrf/gazebo/pull/3160)
 
 ## Gazebo 11.10.0 (2022-01-12)
 
 1. Use boost/bind/bind.hpp to fix warnings on Arch Linux
-    * [Pull request #3156](https://github.com/ignitionrobotics/gazebo/pull/3156)
+    * [Pull request #3156](https://github.com/osrf/gazebo/pull/3156)
     * Inspired by a contribution from Alex Dewar <alex.dewar@gmx.co.uk>
 
 1. Fix focal builds: use python3 with check_test_ran.py
-    * [Pull request #3155](https://github.com/ignitionrobotics/gazebo/pull/3155)
+    * [Pull request #3155](https://github.com/osrf/gazebo/pull/3155)
 
 1. Load model plugins even after sensor timeout
-    * [Pull request #3154](https://github.com/ignitionrobotics/gazebo/pull/3154)
+    * [Pull request #3154](https://github.com/osrf/gazebo/pull/3154)
 
 1. CMake exports: remove -std=c++11 flag
-    * [Pull request #3050](https://github.com/ignitionrobotics/gazebo/pull/3050)
+    * [Pull request #3050](https://github.com/osrf/gazebo/pull/3050)
     * A contribution from Guilhem Saurel <guilhem.saurel@laas.fr>
 
 1. Create github action ci
-    * [Pull request #3049](https://github.com/ignitionrobotics/gazebo/pull/3049)
+    * [Pull request #3049](https://github.com/osrf/gazebo/pull/3049)
     * A contribution from Tal Regev <tal.regev@gmail.com>
 
 1. Fix Windows build when using vcpkg
-    * [Pull request #3132](https://github.com/ignitionrobotics/gazebo/pull/3132)
+    * [Pull request #3132](https://github.com/osrf/gazebo/pull/3132)
     * A contribution from Akash Munagala <akash.munagala@gmail.com>
 
 1. Point light shadows
-    * [Pull request #3051](https://github.com/ignitionrobotics/gazebo/pull/3051)
+    * [Pull request #3051](https://github.com/osrf/gazebo/pull/3051)
 
 ## Gazebo 11.9.1 (2021-12-02)
 

From 1718514d0218283528f29c9f84ab44846b27937d Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Fri, 14 Jan 2022 11:07:16 -0800
Subject: [PATCH 4/6] Define BOOST_BIND_GLOBAL_PLACEHOLDERS in headers

Define this symbol to fix warnings in the specific
header files where we include boost/bind.hpp,
which is more targeted than a -D compiler flag.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 gazebo/common/MovingWindowFilter.hh | 6 +++++-
 gazebo/common/WeakBind.hh           | 6 +++++-
 gazebo/transport/Connection.hh      | 4 ++++
 gazebo/transport/Node.hh            | 5 +++++
 gazebo/transport/TopicManager.hh    | 4 ++++
 gazebo/transport/TransportIface.hh  | 4 ++++
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/gazebo/common/MovingWindowFilter.hh b/gazebo/common/MovingWindowFilter.hh
index 87b54921ab..24abfffb42 100644
--- a/gazebo/common/MovingWindowFilter.hh
+++ b/gazebo/common/MovingWindowFilter.hh
@@ -22,8 +22,12 @@
 #include <vector>
 #include <map>
 
-#include <boost/function.hpp>
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/bind.hpp>
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
diff --git a/gazebo/common/WeakBind.hh b/gazebo/common/WeakBind.hh
index b406138e6c..e278d6fda1 100644
--- a/gazebo/common/WeakBind.hh
+++ b/gazebo/common/WeakBind.hh
@@ -18,8 +18,12 @@
 #ifndef GAZEBO_COMMON_WEAKBIND_HH_
 #define GAZEBO_COMMON_WEAKBIND_HH_
 
-#include <boost/shared_ptr.hpp>
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gazebo
 {
diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh
index bb48a73bfc..20634e02d9 100644
--- a/gazebo/transport/Connection.hh
+++ b/gazebo/transport/Connection.hh
@@ -20,6 +20,10 @@
 #include <tbb/task.h>
 #include <google/protobuf/message.h>
 
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh
index bf5bd96258..26242874cd 100644
--- a/gazebo/transport/Node.hh
+++ b/gazebo/transport/Node.hh
@@ -19,6 +19,11 @@
 #define GAZEBO_TRANSPORT_NODE_HH_
 
 #include <tbb/task.h>
+
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <map>
diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh
index 7714e5daf7..b2adc04c8d 100644
--- a/gazebo/transport/TopicManager.hh
+++ b/gazebo/transport/TopicManager.hh
@@ -17,6 +17,10 @@
 #ifndef GAZEBO_TRANSPORT_TOPICMANAGER_HH_
 #define GAZEBO_TRANSPORT_TOPICMANAGER_HH_
 
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <map>
diff --git a/gazebo/transport/TransportIface.hh b/gazebo/transport/TransportIface.hh
index e860997120..4b5d6045c1 100644
--- a/gazebo/transport/TransportIface.hh
+++ b/gazebo/transport/TransportIface.hh
@@ -17,6 +17,10 @@
 #ifndef _GAZEBO_TRANSPORTIFACE_HH_
 #define _GAZEBO_TRANSPORTIFACE_HH_
 
+// This fixes compiler warnings, see #3147 and #3160
+#ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
 #include <boost/bind.hpp>
 #include <string>
 #include <list>

From e9679003f62db29819761f4eae4d949cacacf8ee Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 19 Jan 2022 09:53:24 -0800
Subject: [PATCH 5/6] Add #3161 to changelog

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 20057d2313..5756ef68a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,9 @@
 1. Revert boost/bind.hpp changes in header files
     * [Pull request #3160](https://github.com/osrf/gazebo/pull/3160)
 
+1. Fix duplicate vertex program name Ogre crash
+    * [Pull request #3161](https://github.com/osrf/gazebo/pull/3161)
+
 ## Gazebo 11.10.0 (2022-01-12)
 
 1. Use boost/bind/bind.hpp to fix warnings on Arch Linux

From 78204f6a189e57fbb337e29277013eacd50adc26 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 19 Jan 2022 09:54:01 -0800
Subject: [PATCH 6/6] Update date for 11.10.1

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 5756ef68a9..ec93460640 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,6 @@
 ## Gazebo 11
 
-## Gazebo 11.10.1 (2022-01-13)
+## Gazebo 11.10.1 (2022-01-19)
 
 1. Revert boost/bind.hpp changes in header files
     * [Pull request #3160](https://github.com/osrf/gazebo/pull/3160)