summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann von Kleist2020-05-10 14:18:45 +0200
committerHermann von Kleist2020-05-10 14:18:45 +0200
commit86b14b35c87cf16eec1cca9645b52100edbdf70a (patch)
treedb626783f9dc27112f4e054cb314702845a3bd2e
parenta184d88a208ecc705737bdab127ffd128e47d585 (diff)
downloadaur-86b14b35c87cf16eec1cca9645b52100edbdf70a.tar.gz
Update to 1.15.4 and noetic
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD25
2 files changed, 22 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c326be7c0aa..d52200cfb4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-rosout
+pkgbase = ros-noetic-rosout
pkgdesc = ROS - System-wide logging mechanism for messages sent to the /rosout topic.
- pkgver = 1.14.3
- pkgrel = 2
+ pkgver = 1.15.4
+ pkgrel = 1
url = https://wiki.ros.org/rosout
arch = i686
arch = x86_64
@@ -11,13 +11,13 @@ pkgbase = ros-melodic-rosout
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-rosgraph-msgs
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-catkin
- depends = ros-melodic-rosgraph-msgs
- depends = ros-melodic-roscpp
- source = ros-melodic-rosout-1.14.3.tar.gz::https://github.com/ros/ros_comm/archive/1.14.3.tar.gz
- sha256sums = 3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f
+ makedepends = ros-noetic-rosgraph-msgs
+ makedepends = ros-noetic-roscpp
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-rosgraph-msgs
+ depends = ros-noetic-roscpp
+ source = ros-noetic-rosout-1.15.4.tar.gz::https://github.com/ros/ros_comm/archive/1.15.4.tar.gz
+ sha256sums = d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e
-pkgname = ros-melodic-rosout
+pkgname = ros-noetic-rosout
diff --git a/PKGBUILD b/PKGBUILD
index c5f01ee5e1b..f827b4a022f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
pkgdesc="ROS - System-wide logging mechanism for messages sent to the /rosout topic."
url='https://wiki.ros.org/rosout'
-pkgname='ros-melodic-rosout'
-pkgver='1.14.3'
+pkgname='ros-noetic-rosout'
+pkgver='1.15.4'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
license=('BSD')
ros_makedepends=(
- ros-melodic-rosgraph-msgs
- ros-melodic-roscpp
- ros-melodic-catkin
+ ros-noetic-rosgraph-msgs
+ ros-noetic-roscpp
+ ros-noetic-catkin
)
makedepends=(
@@ -22,8 +22,8 @@ makedepends=(
)
ros_depends=(
- ros-melodic-rosgraph-msgs
- ros-melodic-roscpp
+ ros-noetic-rosgraph-msgs
+ ros-noetic-roscpp
)
depends=(
@@ -32,25 +32,22 @@ depends=(
_dir="ros_comm-${pkgver}/tools/rosout"
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
-sha256sums=('3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f')
+sha256sums=('d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e')
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