summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann von Kleist2020-05-10 01:09:03 +0200
committerHermann von Kleist2020-05-10 01:09:03 +0200
commit771d17097a33b918abcdb16fb54c4f90aae23a39 (patch)
tree9249e7420a1e12e04e54ec8d1e869059a68201f5
parent910e83ca888eb46e84d8eab5c16e1c37ca21bb56 (diff)
downloadaur-771d17097a33b918abcdb16fb54c4f90aae23a39.tar.gz
Update to 1.15.2 and noetic
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD22
2 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b0e25e093c..aef41940be7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-pkgbase = ros-melodic-roslang
+pkgbase = ros-noetic-roslang
pkgdesc = ROS - roslang is a common package that all ROS client libraries depend on.
- pkgver = 1.14.6
+ pkgver = 1.15.2
pkgrel = 1
url = https://wiki.ros.org/roslang
arch = any
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- depends = ros-melodic-genmsg
- depends = ros-melodic-catkin
- source = ros-melodic-roslang-1.14.6.tar.gz::https://github.com/ros/ros/archive/1.14.6.tar.gz
- sha256sums = 62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-genmsg
+ depends = ros-noetic-catkin
+ source = ros-noetic-roslang-1.15.2.tar.gz::https://github.com/ros/ros/archive/1.15.2.tar.gz
+ sha256sums = 596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e
-pkgname = ros-melodic-roslang
+pkgname = ros-noetic-roslang
diff --git a/PKGBUILD b/PKGBUILD
index 5bfdc4a55fa..c3da87a417f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgdesc="ROS - roslang is a common package that all ROS client libraries depend on."
url='https://wiki.ros.org/roslang'
-pkgname='ros-melodic-roslang'
-pkgver='1.14.6'
+pkgname='ros-noetic-roslang'
+pkgver='1.15.2'
arch=('any')
pkgrel=1
license=('BSD')
ros_makedepends=(
- ros-melodic-catkin
+ ros-noetic-catkin
)
makedepends=(
@@ -20,8 +20,8 @@ makedepends=(
)
ros_depends=(
- ros-melodic-genmsg
- ros-melodic-catkin
+ ros-noetic-genmsg
+ ros-noetic-catkin
)
depends=(
@@ -30,29 +30,23 @@ depends=(
_dir="ros-${pkgver}/core/roslang"
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros/archive/${pkgver}.tar.gz")
-sha256sums=('62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c')
+sha256sums=('596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e')
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
+ [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
# 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 3 ${srcdir}/${_dir}
-
# Build the project.
cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-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
}