diff options
| author | Akash Patel | 2022-05-13 04:44:19 -0400 |
|---|---|---|
| committer | GitHub | 2022-05-13 09:44:19 +0100 |
| commit | 889ed657d02fb102e8a491c026622108828ce833 (patch) | |
| tree | fc2061775d07b1b779d90a50c686f66e392fb389 | |
| parent | 60041f20cf44ed0c2cc91a300b9db6d413a05efb (diff) | |
| download | aur-889ed657d02fb102e8a491c026622108828ce833.tar.gz | |
upgpkg: gazebo 11.10.2-3 (#19)
use upstream string patch, remove released c++11 export fix
Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 24 |
2 files changed, 16 insertions, 17 deletions
@@ -1,14 +1,13 @@ pkgbase = gazebo pkgdesc = A multi-robot simulator for outdoor environments pkgver = 11.10.2 - pkgrel = 2 + pkgrel = 3 url = http://gazebosim.org/ install = gazebo.install arch = i686 arch = x86_64 license = Apache makedepends = cmake - makedepends = git makedepends = doxygen makedepends = ruby-ronn depends = boost @@ -41,7 +40,9 @@ pkgbase = gazebo optdepends = libusb: USB peripherals support optdepends = simbody: Simbody support optdepends = urdfdom: Load URDF files - source = git+https://github.com/osrf/gazebo.git#tag=gazebo11_11.10.2 - sha256sums = SKIP + source = gazebo-11.10.2.tar.gz::https://github.com/osrf/gazebo/archive/gazebo11_11.10.2.tar.gz + source = string.patch::https://github.com/osrf/gazebo/commit/2f0f7af4868883d1a6fea30086b3fcd703d583fc.patch + sha256sums = 9570454e0341e40881ed8659f8ec9aa45e24d172421e8556d0714cf7b5018511 + sha256sums = a94a7e22696074f88ae1a8f2af3f39ef5041b91785b2b52a73dbf8b9a1c4fd52 pkgname = gazebo @@ -1,4 +1,5 @@ # Maintainer: Alex Dewar <a.dewar@sussex.ac.uk> +# Contributor: acxz <akashpatel2008 at yahoo dot com> # Contributor: Troy Patrick <patrictroy at gmail dot com> # Contributor: racko <tim dot rakowski at gmail dot com> # Contributor: marauder <abhinav dot kssk at gmail dot com> @@ -8,7 +9,7 @@ pkgname=gazebo pkgver=11.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-robot simulator for outdoor environments" arch=('i686' 'x86_64') url="http://gazebosim.org/" @@ -25,24 +26,21 @@ optdepends=('bullet: Bullet support' 'libusb: USB peripherals support' 'simbody: Simbody support' 'urdfdom: Load URDF files') -makedepends=('cmake' 'git' 'doxygen' 'ruby-ronn') +makedepends=('cmake' 'doxygen' 'ruby-ronn') install="${pkgname}.install" -source=("git+https://github.com/osrf/gazebo.git#tag=gazebo11_$pkgver") -sha256sums=('SKIP') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/osrf/gazebo/archive/${pkgname}11_$pkgver.tar.gz" + "string.patch"::"https://github.com/osrf/gazebo/commit/2f0f7af4868883d1a6fea30086b3fcd703d583fc.patch") +sha256sums=('9570454e0341e40881ed8659f8ec9aa45e24d172421e8556d0714cf7b5018511' + 'a94a7e22696074f88ae1a8f2af3f39ef5041b91785b2b52a73dbf8b9a1c4fd52') prepare() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgname}11_$pkgver" - # Fix for newer versions of protobuf - git cherry-pick 2f0f7af4868883d1a6fea30086b3fcd703d583fc - - # Gazebo's CMake package file forces projects using it to use C++11 by default - # which screws over anyone wanting to use C++14 or newer - sed -i '/-std=c++11/d' cmake/gazebo-config.cmake.in + patch --strip=1 < "${srcdir}/string.patch" } build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgname}11_$pkgver" mkdir -p build && cd build @@ -54,6 +52,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}/build" + cd "${srcdir}/${pkgname}-${pkgname}11_$pkgver/build" DESTDIR="${pkgdir}" make install } |