summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-10-16 19:46:07 +0200
committerTim Rakowski2017-10-16 19:46:07 +0200
commit8c67e6e46a2e35edccfdee2a627417134d8744bd (patch)
tree35f12da6b606dfeea087be53d67adc5d0fdbf226
parente8d8e83708bcd88059a26691fac68260d015dfbb (diff)
downloadaur-8c67e6e46a2e35edccfdee2a627417134d8744bd.tar.gz
Merge with gazebo-ogre-1.10
- Update to 8.1.1 - patched to work with community/ogre-1.10 - removed qt4/qtwebkit dependencies because we work with qt5 and qt5 provides qtwebkit
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD16
-rw-r--r--ogre-1.10.patch94
3 files changed, 112 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0b9b72f273..687c5b24c72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Oct 16 17:45:31 UTC 2017
pkgbase = gazebo
pkgdesc = A multi-robot simulator for outdoor environments
- pkgver = 8.0.0
- pkgrel = 2
+ pkgver = 8.1.1
+ pkgrel = 1
url = http://gazebosim.org/
install = gazebo.install
arch = i686
@@ -21,8 +23,6 @@ pkgbase = gazebo
depends = libxml2>=2.7.7
depends = ogre
depends = protobuf>=2.3.0
- depends = qt4
- depends = qtwebkit
depends = sdformat>=5.0.0
depends = ignition-math>=3
depends = ignition-transport>=3
@@ -39,8 +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.0.0.tar.bz2
- sha256sums = ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12
+ source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.1.1.tar.bz2
+ source = ogre-1.10.patch
+ sha256sums = bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949
+ sha256sums = 99c9e6c24422163cb58a1af0a174b38929bc0dbe90f7fd9690d9d4b3d50ba00b
pkgname = gazebo
diff --git a/PKGBUILD b/PKGBUILD
index a175592b8c1..7006d6caa0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: marauder <abhinav dot kssk at gmail dot com>
+# Maintainer: racko <tim dot rakowski at gmail dot com>
+# Contributor: marauder <abhinav dot kssk at gmail dot com>
# Contributor: Benjamin Chretien <chretien at lirmm dot fr>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
# Contributor: Vladimir Ermakov <vooon341@gmail.com>
pkgname=gazebo
-pkgver=8.0.0
-pkgrel=2
+pkgver=8.1.1
+pkgrel=1
pkgdesc="A multi-robot simulator for outdoor environments"
arch=('i686' 'x86_64')
url="http://gazebosim.org/"
@@ -13,7 +14,7 @@ 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' 'qt4' 'qtwebkit' 'sdformat>=5.0.0' 'ignition-math>=3' 'ignition-transport>=3'
+ 'ogre' 'protobuf>=2.3.0' 'sdformat>=5.0.0' 'ignition-math>=3' 'ignition-transport>=3'
'tinyxml>=2.6.2' 'tinyxml2' 'qwt')
optdepends=('bullet>=2.82: Bullet support'
'cegui>=0.8.3: Design custom graphical interfaces'
@@ -27,10 +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")
-sha256sums=('ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12')
+source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pkgname}-${pkgver}.tar.bz2" "ogre-1.10.patch")
+sha256sums=('bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949'
+ '99c9e6c24422163cb58a1af0a174b38929bc0dbe90f7fd9690d9d4b3d50ba00b')
prepare() {
+ cd "${srcdir}"
+ patch -p1 < ${srcdir}/ogre-1.10.patch
cd "${srcdir}/${pkgname}-${pkgver}"
mkdir -p build && cd build
diff --git a/ogre-1.10.patch b/ogre-1.10.patch
new file mode 100644
index 00000000000..ccfea86e65c
--- /dev/null
+++ b/ogre-1.10.patch
@@ -0,0 +1,94 @@
+diff -ura src/gazebo-8.1.1/gazebo/rendering/RenderEngine.cc src2/gazebo-8.1.1/gazebo/rendering/RenderEngine.cc
+--- src/gazebo-8.1.1/gazebo/rendering/RenderEngine.cc 2017-01-26 02:16:27.000000000 +0100
++++ src2/gazebo-8.1.1/gazebo/rendering/RenderEngine.cc 2017-08-06 19:28:22.086767172 +0200
+@@ -351,7 +351,6 @@
+ // TODO: this was causing a segfault. Need to debug, and put back in
+ if (this->dataPtr->root)
+ {
+- this->dataPtr->root->shutdown();
+ /*const Ogre::Root::PluginInstanceList ll =
+ this->dataPtr->root->getInstalledPlugins();
+
+diff -ura src/gazebo-8.1.1/gazebo/rendering/skyx/src/MeshManager.cpp src2/gazebo-8.1.1/gazebo/rendering/skyx/src/MeshManager.cpp
+--- src/gazebo-8.1.1/gazebo/rendering/skyx/src/MeshManager.cpp 2017-01-26 02:16:27.000000000 +0100
++++ src2/gazebo-8.1.1/gazebo/rendering/skyx/src/MeshManager.cpp 2017-08-25 23:33:57.747595635 +0200
+@@ -32,9 +32,9 @@
+ , mCreated(false)
+ , mSubMesh(0)
+ , mEntity(0)
+- , mVertexBuffer(0)
++ , mVertexBuffer()
+ , mVertices(0)
+- , mIndexBuffer(0)
++ , mIndexBuffer()
+ , mSceneNode(0)
+ , mSteps(70)
+ , mCircles(95)
+diff -ura src/gazebo-8.1.1/gazebo/rendering/skyx/src/VClouds/DataManager.cpp src2/gazebo-8.1.1/gazebo/rendering/skyx/src/VClouds/DataManager.cpp
+--- src/gazebo-8.1.1/gazebo/rendering/skyx/src/VClouds/DataManager.cpp 2017-01-26 02:16:27.000000000 +0100
++++ src2/gazebo-8.1.1/gazebo/rendering/skyx/src/VClouds/DataManager.cpp 2017-08-06 19:27:43.967225361 +0200
+@@ -22,6 +22,8 @@
+ */
+
+ #include <vector>
++
++#include <OgrePixelFormat.h>
+ #include "VClouds/DataManager.h"
+
+ #include "VClouds/VClouds.h"
+@@ -689,8 +691,12 @@
+ {
+ for (x = pb.left; x < pb.right; x++)
+ {
++ Ogre::uint8 *ptr = (Ogre::uint8 *)pb.data +
++ (x + y * pb.rowPitch + z * pb.slicePitch) *
++ Ogre::PixelUtil::getNumElemBytes(pb.format);
++
+ Ogre::PixelUtil::packColour(c[x][y][z].dens/* TODO!!!! */,
+- c[x][y][z].light, 0, 0, pb.format, &pbptr[x]);
++ c[x][y][z].light, 0, 0, pb.format, ptr);
+ }
+ pbptr += pb.rowPitch;
+ }
+diff -ura src/gazebo-8.1.1/media/materials/scripts/ShadowCaster.material src2/gazebo-8.1.1/media/materials/scripts/ShadowCaster.material
+--- src/gazebo-8.1.1/media/materials/scripts/ShadowCaster.material 2017-01-26 02:16:28.000000000 +0100
++++ src2/gazebo-8.1.1/media/materials/scripts/ShadowCaster.material 2017-08-06 19:27:43.967225361 +0200
+@@ -65,19 +65,3 @@
+ }
+ }
+ }
+-
+-material DeferredRendering/Shadows/RSMCaster_Spot
+-{
+- technique
+- {
+- pass
+- {
+- vertex_program_ref DeferredShading/Shadows/RSMCasterVP
+- {
+- }
+- fragment_program_ref DeferredShading/Shadows/RSMCasterFP_Spot
+- {
+- }
+- }
+- }
+-}
+diff -r 01ac9ab0c44e -r 97d1dae5f3fc gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc
+--- a/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc Tue Sep 12 17:18:20 2017 +0000
++++ b/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc Fri Sep 22 19:47:43 2017 +0200
+@@ -101,7 +101,6 @@
+
+ Ogre::String programSource = ss.str();
+
+- std::cout << programSource << "\n";
+ Ogre::String programName = this->baseName + "VP_" +
+ Ogre::StringConverter::toString(_permutation);
+
+@@ -294,7 +293,6 @@
+ Ogre::String programName = this->baseName + "FP_" +
+ Ogre::StringConverter::toString(_permutation);
+
+- std::cout << programSource << "\n";
+ #if OGRE_DEBUG_MODE
+ Ogre::LogManager::getSingleton().getDefaultLog()->logMessage(programSource);
+ #endif