updpkg 1.0.5

2 files changed, 68 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d534f99acb3e..e54f12e9fffe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ros-noetic-moveit-ros-visualization
 	pkgdesc = ROS - Components of MoveIt that offer visualization.
-	pkgver = 1.0.2
-	pkgrel = 3
-	url = https://moveit.ros.org
+	pkgver = 1.0.5
+	pkgrel = 1
+	url = https://wiki.ros.org/moveit_ros_visualization
 	arch = i686
 	arch = x86_64
 	arch = aarch64
@@ -11,33 +11,27 @@ pkgbase = ros-noetic-moveit-ros-visualization
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-noetic-object-recognition-msgs
-	makedepends = ros-noetic-pluginlib
-	makedepends = ros-noetic-moveit-ros-warehouse
-	makedepends = ros-noetic-interactive-markers
-	makedepends = ros-noetic-rospy
-	makedepends = ros-noetic-roscpp
-	makedepends = ros-noetic-moveit-ros-planning-interface
-	makedepends = ros-noetic-rviz
-	makedepends = ros-noetic-moveit-ros-robot-interaction
-	makedepends = ros-noetic-geometric-shapes
 	makedepends = ros-noetic-catkin
-	makedepends = ros-noetic-moveit-ros-perception
-	makedepends = eigen
+	makedepends = ros-noetic-class-loader
 	makedepends = pkg-config
+	makedepends = eigen
+	makedepends = ogre
+	makedepends = qt5-base
+	depends = ros-noetic-geometric-shapes
+	depends = ros-noetic-interactive-markers
+	depends = ros-noetic-moveit-ros-robot-interaction
+	depends = ros-noetic-moveit-ros-perception
+	depends = ros-noetic-moveit-ros-planning-interface
+	depends = ros-noetic-moveit-ros-warehouse
 	depends = ros-noetic-object-recognition-msgs
 	depends = ros-noetic-pluginlib
-	depends = ros-noetic-moveit-ros-warehouse
-	depends = ros-noetic-interactive-markers
-	depends = ros-noetic-rospy
+	depends = ros-noetic-rosconsole
 	depends = ros-noetic-roscpp
-	depends = ros-noetic-moveit-ros-planning-interface
+	depends = ros-noetic-rospy
 	depends = ros-noetic-rviz
-	depends = ros-noetic-moveit-ros-robot-interaction
-	depends = ros-noetic-geometric-shapes
-	depends = ros-noetic-moveit-ros-perception
-	source = ros-noetic-moveit-ros-visualization-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
-	sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4
+	depends = ros-noetic-tf2-eigen
+	source = ros-noetic-moveit-ros-visualization-1.0.5.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.5.tar.gz
+	sha256sums = 78f874c64156d761c77e0988ae1a4d9e492023b33664dcf1299ec6154f2bd45a
 
 pkgname = ros-noetic-moveit-ros-visualization
 
diff --git a/PKGBUILD b/PKGBUILD
index 366687d6c14e..d577ed79bbca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,77 +1,68 @@
-# Maintainer: Timon Engelke <aur@timonengelke.de>
 pkgdesc="ROS - Components of MoveIt that offer visualization."
-url='https://moveit.ros.org'
+url='https://wiki.ros.org/moveit_ros_visualization'
 
 pkgname='ros-noetic-moveit-ros-visualization'
-pkgver='1.0.2'
+pkgver='1.0.5'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=3
+pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-noetic-object-recognition-msgs
-  ros-noetic-pluginlib
-  ros-noetic-moveit-ros-warehouse
-  ros-noetic-interactive-markers
-  ros-noetic-rospy
-  ros-noetic-roscpp
-  ros-noetic-moveit-ros-planning-interface
-  ros-noetic-rviz
-  ros-noetic-moveit-ros-robot-interaction
-  ros-noetic-geometric-shapes
-  ros-noetic-catkin
-  ros-noetic-moveit-ros-perception)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  eigen
-  pkg-config)
+ros_makedepends=(
+    ros-noetic-catkin
+    ros-noetic-class-loader
+)
+makedepends=(
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
+    pkg-config
+    eigen
+    ogre
+    qt5-base
+)
 
-ros_depends=(ros-noetic-object-recognition-msgs
-  ros-noetic-pluginlib
-  ros-noetic-moveit-ros-warehouse
-  ros-noetic-interactive-markers
-  ros-noetic-rospy
-  ros-noetic-roscpp
-  ros-noetic-moveit-ros-planning-interface
-  ros-noetic-rviz
-  ros-noetic-moveit-ros-robot-interaction
-  ros-noetic-geometric-shapes
-  ros-noetic-moveit-ros-perception)
-depends=(${ros_depends[@]})
+ros_depends=(
+    ros-noetic-geometric-shapes
+    ros-noetic-interactive-markers
+    ros-noetic-moveit-ros-robot-interaction
+    ros-noetic-moveit-ros-perception
+    ros-noetic-moveit-ros-planning-interface
+    ros-noetic-moveit-ros-warehouse
+    ros-noetic-object-recognition-msgs
+    ros-noetic-pluginlib
+    ros-noetic-rosconsole
+    ros-noetic-roscpp
+    ros-noetic-rospy
+    ros-noetic-rviz
+    ros-noetic-tf2-eigen
+)
+depends=(
+    ${ros_depends[@]}
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/noetic/moveit_ros_visualization/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag})
-# sha256sums=('648a7419c00fa9e0d6575e1d7afa381dfe33cdcfe83348a8145c23801ecb80dd')
-
-# Tarball version (faster download)
 _dir="moveit-${pkgver}/moveit_ros/visualization"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit/archive/${pkgver}.tar.gz")
-sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4')
-
-prepare() {
-  sed -i "/#include <moveit\/macros\/class_forward.h/i#include <boost\/thread\/mutex.hpp>" ${srcdir}/${_dir}/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/trajectory_visualization.h
-}
+sha256sums=('78f874c64156d761c77e0988ae1a4d9e492023b33664dcf1299ec6154f2bd45a')
 
 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
+    # 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
 
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+    # Create build directory
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
 
-  # 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
+    # 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
 }