summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:16:50 -0400
committeracxz2020-05-24 12:16:50 -0400
commit7be0404276e582ab19149ed6a4914affc2378948 (patch)
tree0ce0f2b39558b959801a5d9d9abefe882a63d595
parent7999e48632828fb043ce6b34a66e6e157b4d397d (diff)
downloadaur-7be0404276e582ab19149ed6a4914affc2378948.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD30
2 files changed, 25 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94147ae75946..08f2401bd05d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rqt-rviz
+pkgbase = ros-noetic-rqt-rviz
pkgdesc = ROS - rqt_rviz provides a GUI plugin embedding RViz.
pkgver = 0.6.0
pkgrel = 3
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-rqt-rviz
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-rviz
- makedepends = ros-melodic-rqt-gui-cpp
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-rqt-gui
- makedepends = ros-melodic-pluginlib
+ makedepends = ros-noetic-rviz
+ makedepends = ros-noetic-rqt-gui-cpp
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-rqt-gui
+ makedepends = ros-noetic-pluginlib
makedepends = boost
makedepends = qt5-base
- depends = ros-melodic-rqt-gui
- depends = ros-melodic-rqt-gui-cpp
- depends = ros-melodic-rviz
- depends = ros-melodic-pluginlib
+ depends = ros-noetic-rqt-gui
+ depends = ros-noetic-rqt-gui-cpp
+ depends = ros-noetic-rviz
+ depends = ros-noetic-pluginlib
depends = boost
- source = ros-melodic-rqt-rviz-0.6.0.tar.gz::https://github.com/ros-visualization/rqt_rviz/archive/0.6.0.tar.gz
+ source = ros-noetic-rqt-rviz-0.6.0.tar.gz::https://github.com/ros-visualization/rqt_rviz/archive/0.6.0.tar.gz
sha256sums = 5007bf1c30ebe9e68e8ca3a4fa017f81671f1422e55a75b51aaf276ff74bfb0e
-pkgname = ros-melodic-rqt-rviz
+pkgname = ros-noetic-rqt-rviz
diff --git a/PKGBUILD b/PKGBUILD
index 0511c940d447..12389ad2903f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - rqt_rviz provides a GUI plugin embedding RViz."
url='https://wiki.ros.org/rqt_rviz'
-pkgname='ros-melodic-rqt-rviz'
+pkgname='ros-noetic-rqt-rviz'
pkgver='0.6.0'
_pkgver_patch=0
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,11 +11,11 @@ pkgrel=3
license=('BSD')
ros_makedepends=(
- ros-melodic-rviz
- ros-melodic-rqt-gui-cpp
- ros-melodic-catkin
- ros-melodic-rqt-gui
- ros-melodic-pluginlib
+ ros-noetic-rviz
+ ros-noetic-rqt-gui-cpp
+ ros-noetic-catkin
+ ros-noetic-rqt-gui
+ ros-noetic-pluginlib
)
makedepends=(
@@ -27,10 +27,10 @@ makedepends=(
)
ros_depends=(
- ros-melodic-rqt-gui
- ros-melodic-rqt-gui-cpp
- ros-melodic-rviz
- ros-melodic-pluginlib
+ ros-noetic-rqt-gui
+ ros-noetic-rqt-gui-cpp
+ ros-noetic-rviz
+ ros-noetic-pluginlib
)
depends=(
@@ -45,21 +45,17 @@ sha256sums=('5007bf1c30ebe9e68e8ca3a4fa017f81671f1422e55a75b51aaf276ff74bfb0e')
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 \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}