Update to 8.2.0

* Also backported an upstream patch for tinyxml6 compatibility:
https://bitbucket.org/osrf/gazebo/commits/be154a72c765abd6d9517c04cd46c96870edf5c2

3 files changed, 54 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 687c5b24c721..9c112fdd7b20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 16 17:45:31 UTC 2017
+# Tue Dec 12 19:34:40 UTC 2017
 pkgbase = gazebo
 	pkgdesc = A multi-robot simulator for outdoor environments
-	pkgver = 8.1.1
+	pkgver = 8.2.0
 	pkgrel = 1
 	url = http://gazebosim.org/
 	install = gazebo.install
@@ -39,10 +39,10 @@ pkgbase = gazebo
 	optdepends = ruby-ronn: Generate manpages
 	optdepends = simbody>=3.3: Simbody support
 	optdepends = urdfdom: Load URDF files
-	source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.1.1.tar.bz2
-	source = ogre-1.10.patch
-	sha256sums = bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949
-	sha256sums = 99c9e6c24422163cb58a1af0a174b38929bc0dbe90f7fd9690d9d4b3d50ba00b
+	source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.2.0.tar.bz2
+	source = tinyxml6.patch
+	sha256sums = 2c663c446d93eec4718fd5b4985d1b85dbf29828788f6d214cce1253153d983e
+	sha256sums = ca4822ea22bba6f3df1fc7e1d79cff8ea3f5c51b7af0d26b7a99e86f93ca3081
 
 pkgname = gazebo
 
diff --git a/PKGBUILD b/PKGBUILD
index 7006d6caa0a1..80144a5768ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Vladimir Ermakov <vooon341@gmail.com>
 
 pkgname=gazebo
-pkgver=8.1.1
+pkgver=8.2.0
 pkgrel=1
 pkgdesc="A multi-robot simulator for outdoor environments"
 arch=('i686' 'x86_64')
@@ -28,14 +28,13 @@ optdepends=('bullet>=2.82: Bullet support'
             'urdfdom: Load URDF files')
 makedepends=('cmake' 'doxygen' 'pkg-config>=0.26')
 install="${pkgname}.install"
-source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pkgname}-${pkgver}.tar.bz2" "ogre-1.10.patch")
-sha256sums=('bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949'
-            '99c9e6c24422163cb58a1af0a174b38929bc0dbe90f7fd9690d9d4b3d50ba00b')
+source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pkgname}-${pkgver}.tar.bz2" "tinyxml6.patch")
+sha256sums=('2c663c446d93eec4718fd5b4985d1b85dbf29828788f6d214cce1253153d983e'
+            'ca4822ea22bba6f3df1fc7e1d79cff8ea3f5c51b7af0d26b7a99e86f93ca3081')
 
 prepare() {
-  cd "${srcdir}"
-  patch -p1 < ${srcdir}/ogre-1.10.patch
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ${srcdir}/tinyxml6.patch
 
   mkdir -p build && cd build
 
diff --git a/tinyxml6.patch b/tinyxml6.patch
new file mode 100644
index 000000000000..2ceee954c14d
--- /dev/null
+++ b/tinyxml6.patch
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User Steve Peters <scpeters@openrobotics.org>
+# Date 1513105358 28800
+# Branch tinyxml2_6_gazebo8
+# Node ID be154a72c765abd6d9517c04cd46c96870edf5c2
+# Parent  028285bda338b580f60775c57dfbcb44781538d3
+support tinyxml2 version 6.0.0 on gazebo8
+
+diff --git a/gazebo/util/CMakeLists.txt b/gazebo/util/CMakeLists.txt
+--- a/gazebo/util/CMakeLists.txt
++++ b/gazebo/util/CMakeLists.txt
+@@ -89,6 +89,14 @@
+   ${IGNITION-MSGS_LIBRARIES}
+ )
+ 
++# define if tinxml2 major version >= 6
++# https://bitbucket.org/ignitionrobotics/ign-common/issues/28
++if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0")
++  message(STATUS "tinyxml2_VERSION ${tinyxml2_VERSION} >= 6.0.0")
++  target_compile_definitions(gazebo_util
++    PRIVATE "TINYXML2_MAJOR_VERSION_GE_6")
++endif()
++
+ if (WIN32)
+   include_directories(IGNITION-MSGS_INCLUDE_DIR)
+   set_target_properties(gazebo_util PROPERTIES COMPILE_FLAGS "/FIignition/msgs/System.hh")
+diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc
+--- a/gazebo/util/LogPlay.cc
++++ b/gazebo/util/LogPlay.cc
+@@ -125,8 +125,13 @@
+   {
+     gzerr << "Unable to load file[" << _logFile << "]. "
+       << "Check the Gazebo server log file for more information.\n";
++#ifdef TINYXML2_MAJOR_VERSION_GE_6
++    const char *errorStr1 = this->dataPtr->xmlDoc.ErrorStr();
++    const char *errorStr2 = nullptr;
++#else
+     const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1();
+     const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2();
++#endif
+     if (errorStr1)
+       gzlog << "Log Error 1:\n" << errorStr1 << std::endl;
+     if (errorStr2)