summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO61
-rw-r--r--PKGBUILD121
2 files changed, 81 insertions, 101 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c91c1fd8842c..4afa439cff74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,36 @@
-pkgbase = ros-melodic-rviz-visual-tools
+pkgbase = ros-noetic-rviz-visual-tools
pkgdesc = ROS - Utility functions for displaying and debugging data in Rviz via published markers.
- pkgver = 3.8.0
+ pkgver = 3.9.1
pkgrel = 1
- url = https://github.com/davetcoleman/rviz_visual_tools
- arch = any
+ url = https://wiki.ros.org/rviz_visual_tools
+ arch = i686
+ arch = x86_64
+ arch = aarch64
+ arch = armv7h
+ arch = armv6h
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-roslint
- makedepends = ros-melodic-visualization-msgs
- makedepends = ros-melodic-trajectory-msgs
- makedepends = ros-melodic-geometry-msgs
- makedepends = ros-melodic-eigen-stl-containers
- makedepends = ros-melodic-std-msgs
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-rviz
- makedepends = ros-melodic-sensor-msgs
- makedepends = ros-melodic-graph-msgs
- makedepends = ros-melodic-tf-conversions
- makedepends = ros-melodic-eigen-conversions
- makedepends = ros-melodic-catkin
- makedepends = qt5-x11extras
- depends = ros-melodic-roslint
- depends = ros-melodic-visualization-msgs
- depends = ros-melodic-trajectory-msgs
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-eigen-stl-containers
- depends = ros-melodic-std-msgs
- depends = ros-melodic-roscpp
- depends = ros-melodic-rviz
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-graph-msgs
- depends = ros-melodic-tf-conversions
- depends = ros-melodic-eigen-conversions
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-rviz
+ depends = ros-noetic-sensor-msgs
+ depends = ros-noetic-tf2-eigen
+ depends = ros-noetic-tf2-ros
+ depends = ros-noetic-tf2-geometry-msgs
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-shape-msgs
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-visualization-msgs
+ depends = ros-noetic-graph-msgs
+ depends = ros-noetic-std-msgs
+ depends = ros-noetic-trajectory-msgs
+ depends = ros-noetic-roslint
+ depends = ros-noetic-eigen-stl-containers
+ depends = ros-noetic-interactive-markers
+ depends = ogre
depends = qt5-x11extras
- source = ros-melodic-rviz-visual-tools-3.8.0-0.tar.gz::https://github.com/davetcoleman/rviz_visual_tools-release/archive/release/melodic/rviz_visual_tools/3.8.0-0.tar.gz
- sha256sums = b56e899fa3bb3650e323c5145806805200c17256f1836cd572e4d3631e2e7e90
+ source = ros-noetic-rviz-visual-tools-3.9.1.tar.gz::https://github.com/PickNikRobotics/rviz_visual_tools/archive/3.9.1.tar.gz
+ sha256sums = cabd0c665a464e5e0027cbdece555d933a1f6f963fbc5b088f0c1b39fe817486
-pkgname = ros-melodic-rviz-visual-tools
+pkgname = ros-noetic-rviz-visual-tools
diff --git a/PKGBUILD b/PKGBUILD
index 4b18835ef755..c5e937ff17a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,69 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
pkgdesc="ROS - Utility functions for displaying and debugging data in Rviz via published markers."
-url='https://github.com/davetcoleman/rviz_visual_tools'
+url='https://wiki.ros.org/rviz_visual_tools'
-pkgname='ros-melodic-rviz-visual-tools'
-pkgver='3.8.0'
-_pkgver_patch=0
-arch=('any')
+pkgname='ros-noetic-rviz-visual-tools'
+pkgver='3.9.1'
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-roslint
- ros-melodic-visualization-msgs
- ros-melodic-trajectory-msgs
- ros-melodic-geometry-msgs
- ros-melodic-eigen-stl-containers
- ros-melodic-std-msgs
- ros-melodic-roscpp
- ros-melodic-rviz
- ros-melodic-sensor-msgs
- ros-melodic-graph-msgs
- ros-melodic-tf-conversions
- ros-melodic-eigen-conversions
- ros-melodic-catkin)
-makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]}
- qt5-x11extras)
+ros_makedepends=(
+ ros-noetic-catkin
+)
-ros_depends=(ros-melodic-roslint
- ros-melodic-visualization-msgs
- ros-melodic-trajectory-msgs
- ros-melodic-geometry-msgs
- ros-melodic-eigen-stl-containers
- ros-melodic-std-msgs
- ros-melodic-roscpp
- ros-melodic-rviz
- ros-melodic-sensor-msgs
- ros-melodic-graph-msgs
- ros-melodic-tf-conversions
- ros-melodic-eigen-conversions)
-depends=(${ros_depends[@]}
- qt5-x11extras)
+makedepends=(
+ cmake
+ ros-build-tools
+ ${ros_makedepends[@]}
+)
-# Git version (e.g. for debugging)
-# _tag=release/melodic/rviz_visual_tools/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/davetcoleman/rviz_visual_tools-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+ ros-noetic-rviz
+ ros-noetic-sensor-msgs
+ ros-noetic-tf2-eigen
+ ros-noetic-tf2-ros
+ ros-noetic-tf2-geometry-msgs
+ ros-noetic-geometry-msgs
+ ros-noetic-shape-msgs
+ ros-noetic-roscpp
+ ros-noetic-visualization-msgs
+ ros-noetic-graph-msgs
+ ros-noetic-std-msgs
+ ros-noetic-trajectory-msgs
+ ros-noetic-roslint
+ ros-noetic-eigen-stl-containers
+ ros-noetic-interactive-markers
+)
-# Tarball version (faster download)
-_dir="rviz_visual_tools-release-release-melodic-rviz_visual_tools"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/davetcoleman/rviz_visual_tools-release/archive/release/melodic/rviz_visual_tools/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('b56e899fa3bb3650e323c5145806805200c17256f1836cd572e4d3631e2e7e90')
+depends=(
+ ${ros_depends[@]}
+ ogre
+ qt5-x11extras
+)
-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
+_dir="rviz_visual_tools-${pkgver}"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/PickNikRobotics/rviz_visual_tools/archive/${pkgver}.tar.gz")
+sha256sums=('cabd0c665a464e5e0027cbdece555d933a1f6f963fbc5b088f0c1b39fe817486')
- # Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+build() {
+ # Use ROS environment variables
+ source /usr/share/ros-build-tools/clear-ros-env.sh
+ [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
- # Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
+ # Create build directory
+ [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+ cd ${srcdir}/build
- # Build 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.8 \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.8.so \
- -DPYTHON_BASENAME=-python3.8 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
- make
+ # Build project
+ cmake ${srcdir}/${_dir} \
+ -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
}
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
}