summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2018-02-24 12:49:45 +0100
committerTim Rakowski2018-02-24 12:49:45 +0100
commitb6cd328497a95d7f393b77d782b489d1ebe1fede (patch)
tree675edb0178879bc159c851525ffcf847c109323e
parent6d4f070deb7019f244cc66133c4eced06e297980 (diff)
downloadaur-b6cd328497a95d7f393b77d782b489d1ebe1fede.tar.gz
Update to 9.0.0
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD12
-rw-r--r--tinyxml6.patch43
3 files changed, 15 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c112fdd7b2..743f75ec73b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Dec 12 19:34:40 UTC 2017
+# Sat Feb 24 11:48:39 UTC 2018
pkgbase = gazebo
pkgdesc = A multi-robot simulator for outdoor environments
- pkgver = 8.2.0
+ pkgver = 9.0.0
pkgrel = 1
url = http://gazebosim.org/
install = gazebo.install
@@ -23,10 +23,12 @@ pkgbase = gazebo
depends = libxml2>=2.7.7
depends = ogre
depends = protobuf>=2.3.0
- depends = sdformat>=5.0.0
- depends = ignition-math>=3
- depends = ignition-transport>=3
- depends = tinyxml>=2.6.2
+ depends = sdformat>=6.0.0
+ depends = ignition-math>=4
+ depends = ignition-transport>=4
+ depends = ignition-common
+ depends = ignition-fuel_tools
+ depends = ignition-msgs
depends = tinyxml2
depends = qwt
optdepends = bullet>=2.82: Bullet support
@@ -39,10 +41,8 @@ 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.2.0.tar.bz2
- source = tinyxml6.patch
- sha256sums = 2c663c446d93eec4718fd5b4985d1b85dbf29828788f6d214cce1253153d983e
- sha256sums = ca4822ea22bba6f3df1fc7e1d79cff8ea3f5c51b7af0d26b7a99e86f93ca3081
+ source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.0.0.tar.bz2
+ sha256sums = 2c29955d476c97dc0ccbb1c8295ec6e8ffe203d7bc6047c1f34433a82ab9215e
pkgname = gazebo
diff --git a/PKGBUILD b/PKGBUILD
index 80144a5768a..7a187ed1544 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Vladimir Ermakov <vooon341@gmail.com>
pkgname=gazebo
-pkgver=8.2.0
+pkgver=9.0.0
pkgrel=1
pkgdesc="A multi-robot simulator for outdoor environments"
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ license=('Apache')
# See: http://www.gazebosim.org/tutorials?tut=install_from_source&cat=install
depends=('boost>=1.40.0' 'curl>=4.0' 'freeglut' 'freeimage>=3.0'
'intel-tbb>=3.0' 'libccd>=1.4' 'libltdl>=2.4.2' 'libtar>=1.2' 'libxml2>=2.7.7'
- 'ogre' 'protobuf>=2.3.0' 'sdformat>=5.0.0' 'ignition-math>=3' 'ignition-transport>=3'
- 'tinyxml>=2.6.2' 'tinyxml2' 'qwt')
+ 'ogre' 'protobuf>=2.3.0' 'sdformat>=6.0.0' 'ignition-math>=4' 'ignition-transport>=4'
+ 'ignition-common' 'ignition-fuel_tools' 'ignition-msgs' 'tinyxml2' 'qwt')
optdepends=('bullet>=2.82: Bullet support'
'cegui>=0.8.3: Design custom graphical interfaces'
'ffmpeg: Playback movies on textured surfaces'
@@ -28,13 +28,11 @@ 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" "tinyxml6.patch")
-sha256sums=('2c663c446d93eec4718fd5b4985d1b85dbf29828788f6d214cce1253153d983e'
- 'ca4822ea22bba6f3df1fc7e1d79cff8ea3f5c51b7af0d26b7a99e86f93ca3081')
+source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('2c29955d476c97dc0ccbb1c8295ec6e8ffe203d7bc6047c1f34433a82ab9215e')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ${srcdir}/tinyxml6.patch
mkdir -p build && cd build
diff --git a/tinyxml6.patch b/tinyxml6.patch
deleted file mode 100644
index 2ceee954c14..00000000000
--- a/tinyxml6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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)