summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-06-02 19:35:52 +0100
committerGonçalo Camelo Neves Pereira2018-06-02 19:35:52 +0100
commit71906a67f573c67eff188968cebd0c9be5244486 (patch)
treedc2f20b0443192db3612fa095847617c22bc8e46
parent8ab5b8aeef61b9f2d6f86ab7d3f3db758cf33106 (diff)
downloadaur-71906a67f573c67eff188968cebd0c9be5244486.tar.gz
Fix Library Compatability
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
2 files changed, 15 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26480b0d67b..d70e21bf4cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Sat Feb 24 17:06:19 UTC 2018
pkgbase = gazebo
pkgdesc = A multi-robot simulator for outdoor environments
pkgver = 9.0.0
@@ -11,7 +9,7 @@ pkgbase = gazebo
license = Apache
makedepends = cmake
makedepends = doxygen
- makedepends = pkg-config>=0.26
+ makedepends = pkgconf>=0.26
depends = boost>=1.40.0
depends = curl>=4.0
depends = freeglut
@@ -31,15 +29,15 @@ pkgbase = gazebo
depends = ignition-msgs
depends = tinyxml2
depends = qwt
- optdepends = bullet>=2.82: Bullet support
- optdepends = cegui>=0.8.3: Design custom graphical interfaces
+ optdepends = bullet: Bullet support
+ optdepends = cegui: Design custom graphical interfaces
optdepends = ffmpeg: Playback movies on textured surfaces
optdepends = gdal: Digital elevation terrains support
- optdepends = libdart>=3.0: DART support
+ optdepends = libdart: DART support
optdepends = libspnav: space navigator joystick support
optdepends = libusb: USB peripherals support
optdepends = ruby-ronn: Generate manpages
- optdepends = simbody>=3.3: Simbody support
+ optdepends = simbody: Simbody support
optdepends = urdfdom: Load URDF files
source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.0.0.tar.bz2
source = ogre-1.10.patch
diff --git a/PKGBUILD b/PKGBUILD
index ea9c4289df5..607d05fb092 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,17 +16,17 @@ 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>=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'
+optdepends=('bullet: Bullet support'
+ 'cegui: Design custom graphical interfaces'
'ffmpeg: Playback movies on textured surfaces'
'gdal: Digital elevation terrains support'
- 'libdart>=3.0: DART support'
+ 'libdart: DART support'
'libspnav: space navigator joystick support'
'libusb: USB peripherals support'
'ruby-ronn: Generate manpages'
- 'simbody>=3.3: Simbody support'
+ 'simbody: Simbody support'
'urdfdom: Load URDF files')
-makedepends=('cmake' 'doxygen' 'pkg-config>=0.26')
+makedepends=('cmake' 'doxygen' 'pkgconf>=0.26')
install="${pkgname}.install"
source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pkgname}-${pkgver}.tar.bz2" "ogre-1.10.patch")
sha256sums=('2c29955d476c97dc0ccbb1c8295ec6e8ffe203d7bc6047c1f34433a82ab9215e'
@@ -40,6 +40,11 @@ prepare() {
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's/CODEC_CAP_TRUNCATED/AV_CODEC_CAP_TRUNCATED/g' gazebo/common/AudioDecoder.cc
+ sed -i -e 's/CODEC_FLAG_TRUNCATED/AV_CODEC_FLAG_TRUNCATED/g' gazebo/common/AudioDecoder.cc
+
+ sed -i -e 's/CODEC_CAP_TRUNCATED/AV_CODEC_CAP_TRUNCATED/g' gazebo/common/Video.cc
+ sed -i -e 's/CODEC_FLAG_TRUNCATED/AV_CODEC_FLAG_TRUNCATED/g' gazebo/common/Video.cc
mkdir -p build && cd build
# Note: we skip unit tests (else set to TRUE)