summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO44
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD23
-rw-r--r--fix-link-error.patch10
4 files changed, 42 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cd8e5507f544..5f8680023993 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gazebo
pkgdesc = A multi-robot simulator for outdoor environments
- pkgver = 10.2.0
- pkgrel = 2
+ pkgver = 11.0.0
+ pkgrel = 1
url = http://gazebosim.org/
install = gazebo.install
arch = i686
@@ -9,24 +9,25 @@ pkgbase = gazebo
license = Apache
makedepends = cmake
makedepends = doxygen
- depends = boost>=1.40.0
- depends = curl>=4.0
+ makedepends = ruby-ronn
+ depends = boost
+ depends = curl
depends = freeglut
- depends = freeimage>=3.0
- depends = intel-tbb>=3.0
- depends = libccd>=1.4
- depends = libltdl>=2.4.2
- depends = libtar>=1.2
- depends = libxml2>=2.7.7
+ depends = freeimage
+ depends = intel-tbb
+ depends = libccd
+ depends = libltdl
+ depends = libtar
+ depends = libxml
depends = ogre-1.9
depends = protobuf>=2.3.0
- depends = sdformat=6
- depends = ignition-math=4
- depends = ignition-transport=4
- depends = ignition-cmake-0
- depends = ignition-common=1
- depends = ignition-fuel_tools=1
- depends = ignition-msgs=1
+ depends = sdformat>=9
+ depends = ignition-math>=6
+ depends = ignition-transport>=8
+ depends = ignition-cmake>=2
+ depends = ignition-common>=3
+ depends = ignition-fuel_tools>=4
+ depends = ignition-msgs>=5
depends = tinyxml2
depends = qwt
optdepends = bullet: Bullet support
@@ -36,13 +37,12 @@ pkgbase = gazebo
optdepends = libdart: DART support
optdepends = libspnav: space navigator joystick support
optdepends = libusb: USB peripherals support
- optdepends = ruby-ronn: Generate manpages
optdepends = simbody: Simbody support
optdepends = urdfdom: Load URDF files
- source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-10.2.0.tar.bz2
- source = fix-openal.patch::https://bitbucket.org/shrit/gazebo/commits/556354dcebd180e0f1015b96890f9906e441b551/raw
- sha256sums = 47d8bfe70ffcde21cbc6dec142f3aecefaac66c63562aab6114f442f7ab27392
- sha256sums = 4b386e845e94008102609a4fb666d698bee0480d2ce88b250dc1d849cfc93b72
+ source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.0.0.tar.bz2
+ source = fix-link-error.patch
+ sha256sums = 3c823e3ed6fbf79a23663eade5f33460c5334dde3b99e376dcb69fa2561886f5
+ sha256sums = fa193721e84d636031cd47e8f1cce3f0dc97da5358ce63925e23614d78dfa7f7
pkgname = gazebo
diff --git a/.gitignore b/.gitignore
index 70d026107e7a..b73905529f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
*.tar
-*.patch
*.tar.*
*.jar
*.exe
diff --git a/PKGBUILD b/PKGBUILD
index f87693567076..792c9653dfb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,16 @@
# Contributor: Vladimir Ermakov <vooon341@gmail.com>
pkgname=gazebo
-pkgver=10.2.0
-pkgrel=2
+pkgver=11.0.0
+pkgrel=1
pkgdesc="A multi-robot simulator for outdoor environments"
arch=('i686' 'x86_64')
url="http://gazebosim.org/"
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-1.9' 'protobuf>=2.3.0' 'sdformat=6' 'ignition-math=4' 'ignition-transport=4'
- 'ignition-cmake-0' 'ignition-common=1' 'ignition-fuel_tools=1' 'ignition-msgs=1' 'tinyxml2' 'qwt')
+depends=('boost' 'curl' 'freeglut' 'freeimage' 'intel-tbb' 'libccd' 'libltdl'
+ 'libtar' 'libxml' 'ogre-1.9' 'protobuf>=2.3.0' 'sdformat>=9' 'ignition-math>=6' 'ignition-transport>=8'
+ 'ignition-cmake>=2' 'ignition-common>=3' 'ignition-fuel_tools>=4' 'ignition-msgs>=5' 'tinyxml2' 'qwt')
optdepends=('bullet: Bullet support'
'cegui: Design custom graphical interfaces'
'ffmpeg: Playback movies on textured surfaces'
@@ -25,19 +24,18 @@ optdepends=('bullet: Bullet support'
'libdart: DART support'
'libspnav: space navigator joystick support'
'libusb: USB peripherals support'
- 'ruby-ronn: Generate manpages'
'simbody: Simbody support'
'urdfdom: Load URDF files')
-makedepends=('cmake' 'doxygen')
+makedepends=('cmake' 'doxygen' 'ruby-ronn')
install="${pkgname}.install"
source=("http://osrf-distributions.s3.amazonaws.com/$pkgname/releases/$pkgname-$pkgver.tar.bz2"
- "fix-openal.patch::https://bitbucket.org/shrit/gazebo/commits/556354dcebd180e0f1015b96890f9906e441b551/raw")
-sha256sums=('47d8bfe70ffcde21cbc6dec142f3aecefaac66c63562aab6114f442f7ab27392'
- '4b386e845e94008102609a4fb666d698bee0480d2ce88b250dc1d849cfc93b72')
+ "fix-link-error.patch")
+sha256sums=('3c823e3ed6fbf79a23663eade5f33460c5334dde3b99e376dcb69fa2561886f5'
+ 'fa193721e84d636031cd47e8f1cce3f0dc97da5358ce63925e23614d78dfa7f7')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- patch --strip=1 --input=../fix-openal.patch
+ patch --strip=1 --input=../fix-link-error.patch
}
build() {
@@ -45,7 +43,6 @@ build() {
mkdir -p build && cd build
- # Note: we skip unit tests (else set to TRUE)
cmake .. -DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/fix-link-error.patch b/fix-link-error.patch
new file mode 100644
index 000000000000..d0f760b666af
--- /dev/null
+++ b/fix-link-error.patch
@@ -0,0 +1,10 @@
+--- gazebo-10.2.0/CMakeLists.txt 2020-04-08 22:50:23.733672485 -0700
++++ gazebo-10.2.0/CMakeLists.txt 2020-04-08 22:22:55.533102191 -0700
+@@ -3,6 +3,7 @@
+ if(COMMAND CMAKE_POLICY)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ CMAKE_POLICY(SET CMP0004 NEW)
++ CMAKE_POLICY(SET CMP0100 NEW)
+ endif(COMMAND CMAKE_POLICY)
+
+ project (Gazebo)