summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann von Kleist2020-05-10 13:59:47 +0200
committerHermann von Kleist2020-05-10 13:59:47 +0200
commit22c7ef5581300a01bc108af1503f8debfaa9d327 (patch)
tree985220adc4e39800903240c6527df5af93ad3e48
parent5f12f9cea0b4c5fe90f6023215171fa7020e0938 (diff)
downloadaur-22c7ef5581300a01bc108af1503f8debfaa9d327.tar.gz
Update to 1.14.0 and noetic
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD29
2 files changed, 26 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eab1a19f0c42..8e94d4d21fe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-rosconsole
+pkgbase = ros-noetic-rosconsole
pkgdesc = ROS - ROS console output library.
- pkgver = 1.13.10
- pkgrel = 2
+ pkgver = 1.14.0
+ pkgrel = 1
url = https://wiki.ros.org/rosconsole
arch = i686
arch = x86_64
@@ -11,22 +11,22 @@ pkgbase = ros-melodic-rosconsole
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-rostime
- makedepends = ros-melodic-cpp-common
- makedepends = ros-melodic-rosunit
- makedepends = ros-melodic-catkin
+ makedepends = ros-noetic-rostime
+ makedepends = ros-noetic-cpp-common
+ makedepends = ros-noetic-rosunit
+ makedepends = ros-noetic-catkin
makedepends = log4cxx
makedepends = apr
makedepends = boost
makedepends = apr-util
- depends = ros-melodic-rostime
- depends = ros-melodic-cpp-common
- depends = ros-melodic-rosbuild
+ depends = ros-noetic-rostime
+ depends = ros-noetic-cpp-common
+ depends = ros-noetic-rosbuild
depends = log4cxx
depends = apr
depends = apr-util
- source = ros-melodic-rosconsole-1.13.10.tar.gz::https://github.com/ros/rosconsole/archive/1.13.10.tar.gz
- sha256sums = fc4376acac3c4b786fc362cb26e2d683e0687656f9cb7ad66d02464d3935e777
+ source = ros-noetic-rosconsole-1.14.0.tar.gz::https://github.com/ros/rosconsole/archive/1.14.0.tar.gz
+ sha256sums = 7b07d609987979856521dc4cf57aa4e0769630b1896bcbef4beffcd61a4db607
-pkgname = ros-melodic-rosconsole
+pkgname = ros-noetic-rosconsole
diff --git a/PKGBUILD b/PKGBUILD
index 0cbb59e56a7e..d1466ac3c530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
pkgdesc="ROS - ROS console output library."
url='https://wiki.ros.org/rosconsole'
-pkgname='ros-melodic-rosconsole'
-pkgver='1.13.10'
+pkgname='ros-noetic-rosconsole'
+pkgver='1.14.0'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
license=('BSD')
ros_makedepends=(
- ros-melodic-rostime
- ros-melodic-cpp-common
- ros-melodic-rosunit
- ros-melodic-catkin
+ ros-noetic-rostime
+ ros-noetic-cpp-common
+ ros-noetic-rosunit
+ ros-noetic-catkin
)
makedepends=(
@@ -27,9 +27,9 @@ makedepends=(
)
ros_depends=(
- ros-melodic-rostime
- ros-melodic-cpp-common
- ros-melodic-rosbuild
+ ros-noetic-rostime
+ ros-noetic-cpp-common
+ ros-noetic-rosbuild
)
depends=(
@@ -41,25 +41,22 @@ depends=(
_dir="rosconsole-${pkgver}"
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rosconsole/archive/${pkgver}.tar.gz")
-sha256sums=('fc4376acac3c4b786fc362cb26e2d683e0687656f9cb7ad66d02464d3935e777')
+sha256sums=('7b07d609987979856521dc4cf57aa4e0769630b1896bcbef4beffcd61a4db607')
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 \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make