Update gazebo package.

3 files changed, 40 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dc26302eb62..949c98168a1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,32 @@
 pkgbase = gazebo
 	pkgdesc = A multi-robot simulator for outdoor environments
 	pkgver = 1.9.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gazebosim.org/
 	install = gazebo.install
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = cmake
-	depends = boost
-	depends = cegui
+	makedepends = doxygen
+	makedepends = pkg-config>=0.26
+	depends = boost>=1.40.0
+	depends = curl>=4.0
 	depends = freeglut
-	depends = intel-tbb
-	depends = libltdl
-	depends = libxml2
-	depends = ogre
-	depends = protobuf
+	depends = freeimage>=3.0
+	depends = intel-tbb>=3.0
+	depends = libltdl>=2.4.2
+	depends = libtar>=1.2
+	depends = libxml2>=2.7.7
+	depends = ogre>=1.7.1
+	depends = protobuf>=2.3.0
 	depends = qt4
-	depends = tinyxml
+	depends = sdformat-hg
+	depends = tinyxml>=2.6.2
+	optdepends = bullet>=2.81: Bullet support
+	optdepends = cegui-0.7>=0.7.5: Design custom graphical interfaces
+	optdepends = ffmpeg>=0.8.3: Playback movies on textured surfaces
+	optdepends = urdfdom: Load URDF files
 	source = http://gazebosim.org/assets/distributions/gazebo-1.9.1.tar.bz2
 	md5sums = 4f673d7f5daef456f871647d582ff493
 
diff --git a/PKGBUILD b/PKGBUILD
index 8bc2a49ca538..24ba90d1af51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,24 @@
+# Maintainer: Benjamin Chretien <chretien at lirmm dot fr>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Vladimir Ermakov <vooon341@gmail.com>
 
 pkgname=gazebo
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-robot simulator for outdoor environments"
 arch=('i686' 'x86_64')
 url="http://gazebosim.org/"
 license=('Apache')
-depends=('boost' 'cegui' 'freeglut' 'intel-tbb' 'libltdl' 'libxml2' 'ogre' 'protobuf' 'qt4' 'tinyxml')
-makedepends=('cmake')
+# See: http://www.gazebosim.org/user_guide/installation__requirements.html
+depends=('boost>=1.40.0' 'curl>=4.0' 'freeglut' 'freeimage>=3.0'
+         'intel-tbb>=3.0' 'libltdl>=2.4.2' 'libtar>=1.2' 'libxml2>=2.7.7'
+         'ogre>=1.7.1' 'protobuf>=2.3.0' 'qt4' 'sdformat-hg'
+         'tinyxml>=2.6.2')
+optdepends=('bullet>=2.81: Bullet support'
+            'cegui-0.7>=0.7.5: Design custom graphical interfaces'
+            'ffmpeg>=0.8.3: Playback movies on textured surfaces'
+            'urdfdom: Load URDF files')
+makedepends=('cmake' 'doxygen' 'pkg-config>=0.26')
 install="${pkgname}.install"
 source=(http://gazebosim.org/assets/distributions/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('4f673d7f5daef456f871647d582ff493')
@@ -17,12 +26,19 @@ md5sums=('4f673d7f5daef456f871647d582ff493')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  # Create build directory
+  mkdir -p build && cd build
+
+  # Run CMake. We skip unit tests.
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+           -DENABLE_TESTS_COMPILATION:BOOL=False
+
+  # Compile Gazebo
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/gazebo.install b/gazebo.install
index 01571137ecf7..48efec7e3674 100644
--- a/gazebo.install
+++ b/gazebo.install
@@ -1,5 +1,5 @@
 post_install() {
   echo "==> Now you need to export some Gazebo variables:"
-  echo "==>   echo 'source /usr/share/gazebo-1.0.1/setup.sh' >> ~/.bashrc"
+  echo "==>   echo 'source /usr/share/gazebo/setup.sh' >> ~/.bashrc"
   echo "==>   source ~/.bashrc"
 }