summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-08 15:03:22 +0200
committerGonçalo Camelo Neves Pereira2018-09-08 15:03:22 +0200
commit816c4e0bc3c1486e9c43112fe6f962ed4f5df644 (patch)
tree0024e8fe4f28e7342a45e90cfb35e96812755d6d
parentd0c6d8bec7d694f241ba62ef3bb302d40e3dd027 (diff)
downloadaur-816c4e0bc3c1486e9c43112fe6f962ed4f5df644.tar.gz
Update!
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD108
2 files changed, 67 insertions, 53 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a1f24d12f0..6214a5b6346 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,19 +7,19 @@ pkgbase = ros-melodic-stage
license = GPL
makedepends = cmake
makedepends = ros-build-tools
+ makedepends = pkg-config
+ makedepends = mesa
makedepends = fltk
makedepends = libjpeg-turbo
makedepends = gtk2
makedepends = libtool
- makedepends = mesa
- makedepends = pkg-config
depends = ros-melodic-catkin
+ depends = gtk2
+ depends = fltk
depends = libjpeg-turbo
depends = mesa
- depends = fltk
- depends = gtk2
- source = ros-melodic-stage-4.3.0-0.tar.gz::https://github.com/ros-gbp/stage-release/archive/release/melodic/stage/4.3.0-0.tar.gz
- sha256sums = 3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d
+ source = ros-melodic-stage::git+https://github.com/ros-gbp/stage-release.git
+ sha256sums = SKIP
pkgname = ros-melodic-stage
diff --git a/PKGBUILD b/PKGBUILD
index 3669f3cbcb9..ab6ae0fe157 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
pkgdesc="ROS - Mobile robot simulator http://rtv.github.com/Stage."
url='http://rtv.github.com/Stage'
@@ -10,60 +10,74 @@ arch=('any')
pkgrel=1
license=('GPL')
-ros_makedepends=()
-makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]}
- fltk
- libjpeg-turbo
- gtk2
- libtool
- mesa
- pkg-config)
+ros_makedepends=(
+)
-ros_depends=(ros-melodic-catkin)
-depends=(${ros_depends[@]}
- libjpeg-turbo
- mesa
- fltk
- gtk2)
+makedepends=(
+ 'cmake'
+ 'ros-build-tools'
+ ${ros_makedepends[@]}
+ pkg-config
+ mesa
+ fltk
+ libjpeg-turbo
+ gtk2
+ libtool
+)
-# Git version (e.g. for debugging)
-# _tag=release/melodic/stage/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/stage-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+ ros-melodic-catkin
+)
-# Tarball version (faster download)
-_dir="stage-release-release-melodic-stage-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/stage-release/archive/release/melodic/stage/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d')
+depends=(
+ ${ros_depends[@]}
+ gtk2
+ fltk
+ libjpeg-turbo
+ mesa
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/stage-release.git")
+sha256sums=('SKIP')
+
+prepare() {
+ cd ${srcdir}/${_dir}
+ git checkout upstream
+ _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
+
+ if [ -d ${_pkgname} ]; then
+ git subtree split -P ${_pkgname} --branch ${_pkgname}
+ git checkout ${_pkgname}
+ fi
+}
build() {
- # Use ROS environment variables
- source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+ # Use ROS environment variables.
+ source /usr/share/ros-build-tools/clear-ros-env.sh
+ [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
- # Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+ # Create the build directory.
+ [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+ cd ${srcdir}/build
- # Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+ # Fix Python2/Python3 conflicts.
+ /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
- # Build project
- cmake ${srcdir}/${_dir} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
- make
+ # Build the project.
+ cmake ${srcdir}/${_dir} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+ -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+ -DPYTHON_BASENAME=.cpython-37m \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
}
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
}