diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | .gitignore | 18 | ||||
| -rw-r--r-- | PKGBUILD | 204 |
3 files changed, 133 insertions, 103 deletions
@@ -1,6 +1,6 @@ pkgbase = ros-melodic-rviz pkgdesc = ROS - 3D visualization tool for ROS. - pkgver = 1.13.18 + pkgver = 1.13.30.r2.g96a76a40 pkgrel = 1 url = https://wiki.ros.org/rviz arch = i686 @@ -42,7 +42,7 @@ pkgbase = ros-melodic-rviz makedepends = tinyxml2 makedepends = urdfdom-headers makedepends = qt5-base - makedepends = boost1.69 + makedepends = boost depends = ros-melodic-std-srvs depends = ros-melodic-rosbag depends = ros-melodic-tf @@ -73,10 +73,10 @@ pkgbase = ros-melodic-rviz depends = tinyxml2 depends = urdfdom-headers depends = qt5-base - depends = sip4 - depends = python-sip4 - depends = boost1.69 - source = ros-melodic-rviz-1.13.18.tar.gz::https://github.com/ros-visualization/rviz/archive/1.13.18.tar.gz - sha256sums = ffd9b9f49ea99d0c732426ea13822f2f51f7f4c9ac6e50351c3153a4df2c2cf0 + depends = sip + depends = python-pyqt5-sip + depends = boost-libs + source = ros-melodic-rviz::git+https://github.com/ros-visualization/rviz.git#commit=96a76a40473bbc78dc29453891500e90e82fc50a + b2sums = SKIP pkgname = ros-melodic-rviz diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..058ba2318df1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore +*.tar +*.tar.* +*.rpm +*.jar +*.exe +*.msi +*.zip +*.tgz +*.log +*.log.* + +*/ +*.orig +*.bak +*.backup +*.kate-swp +.directory @@ -2,125 +2,137 @@ pkgdesc="ROS - 3D visualization tool for ROS." url='https://wiki.ros.org/rviz' pkgname='ros-melodic-rviz' -pkgver='1.13.18' +pkgver=1.13.30.r2.g96a76a40 +_commit=96a76a40473bbc78dc29453891500e90e82fc50a arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=1 license=('BSD, Creative Commons') ros_makedepends=( - ros-melodic-std-srvs - ros-melodic-rosbag - ros-melodic-tf - ros-melodic-nav-msgs - ros-melodic-urdf - ros-melodic-python-qt-binding - ros-melodic-resource-retriever - ros-melodic-laser-geometry - ros-melodic-std-msgs - ros-melodic-interactive-markers - ros-melodic-message-filters - ros-melodic-rospy - ros-melodic-roslib - ros-melodic-image-transport - ros-melodic-cmake-modules - ros-melodic-catkin - ros-melodic-rosconsole - ros-melodic-roscpp - ros-melodic-visualization-msgs - ros-melodic-sensor-msgs - ros-melodic-map-msgs - ros-melodic-pluginlib - ros-melodic-geometry-msgs + ros-melodic-std-srvs + ros-melodic-rosbag + ros-melodic-tf + ros-melodic-nav-msgs + ros-melodic-urdf + ros-melodic-python-qt-binding + ros-melodic-resource-retriever + ros-melodic-laser-geometry + ros-melodic-std-msgs + ros-melodic-interactive-markers + ros-melodic-message-filters + ros-melodic-rospy + ros-melodic-roslib + ros-melodic-image-transport + ros-melodic-cmake-modules + ros-melodic-catkin + ros-melodic-rosconsole + ros-melodic-roscpp + ros-melodic-visualization-msgs + ros-melodic-sensor-msgs + ros-melodic-map-msgs + ros-melodic-pluginlib + ros-melodic-geometry-msgs ) makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - yaml-cpp - eigen - ogre-1.9 - assimp - mesa - tinyxml2 - urdfdom-headers - qt5-base - boost1.69 + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + yaml-cpp + eigen + ogre-1.9 + assimp + mesa + tinyxml2 + urdfdom-headers + qt5-base + boost ) ros_depends=( - ros-melodic-std-srvs - ros-melodic-rosbag - ros-melodic-tf - ros-melodic-nav-msgs - ros-melodic-urdf - ros-melodic-python-qt-binding - ros-melodic-resource-retriever - ros-melodic-laser-geometry - ros-melodic-media-export - ros-melodic-std-msgs - ros-melodic-interactive-markers - ros-melodic-message-filters - ros-melodic-rospy - ros-melodic-roslib - ros-melodic-image-transport - ros-melodic-rosconsole - ros-melodic-roscpp - ros-melodic-visualization-msgs - ros-melodic-sensor-msgs - ros-melodic-map-msgs - ros-melodic-pluginlib - ros-melodic-geometry-msgs + ros-melodic-std-srvs + ros-melodic-rosbag + ros-melodic-tf + ros-melodic-nav-msgs + ros-melodic-urdf + ros-melodic-python-qt-binding + ros-melodic-resource-retriever + ros-melodic-laser-geometry + ros-melodic-media-export + ros-melodic-std-msgs + ros-melodic-interactive-markers + ros-melodic-message-filters + ros-melodic-rospy + ros-melodic-roslib + ros-melodic-image-transport + ros-melodic-rosconsole + ros-melodic-roscpp + ros-melodic-visualization-msgs + ros-melodic-sensor-msgs + ros-melodic-map-msgs + ros-melodic-pluginlib + ros-melodic-geometry-msgs ) depends=( - ${ros_depends[@]} - yaml-cpp - eigen - ogre-1.9 - assimp - mesa - tinyxml2 - urdfdom-headers - qt5-base - sip4 - python-sip4 - boost1.69 + ${ros_depends[@]} + yaml-cpp + eigen + ogre-1.9 + assimp + mesa + tinyxml2 + urdfdom-headers + qt5-base + sip + python-pyqt5-sip + boost-libs ) -_dir="rviz-${pkgver}/" -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/rviz/archive/${pkgver}.tar.gz") -sha256sums=('ffd9b9f49ea99d0c732426ea13822f2f51f7f4c9ac6e50351c3153a4df2c2cf0') +_dir="${pkgname}/" +source=("${pkgname}::git+https://github.com/ros-visualization/rviz.git#commit=${_commit}") +b2sums=('SKIP') -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 +pkgver() { + cd "${_dir}" + + # Generate git tag based version. Count only proper (v)#.#* [#=number] tags. + local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') - # Fixes OGRE Path issue - PKG_CONFIG_PATH=/opt/OGRE-1.9/lib/pkgconfig:$PKG_CONFIG_PATH + # Format git-based version for pkgver + # Expected format: e.g. 1.5.0rc2.r521.g99982a1c + # Or in case of 'post': 1.5.0.post1.r521.g99982a1c + echo "${_gitversion}" | sed \ + -e 's;^\([0-9][0-9.]*\)[-_.]\([a-zA-Z]\+\);\1\2;' \ + -e 's;\([0-9]\+-g\);r\1;' \ + -e 's;-;.;g' \ + -e 's;\(post.*\);\.\1;' +} + +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 - # Create the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Fixes OGRE Path issue + PKG_CONFIG_PATH=/opt/OGRE-1.9/lib/pkgconfig:$PKG_CONFIG_PATH - # Fix Python2/Python3 conflicts. - /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} + # Create the build directory. + [ -d ${srcdir}/build ] || mkdir ${srcdir}/build + cd ${srcdir}/build - # 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 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DBOOST_ROOT=/opt/boost1.69 \ - -DBoost_NO_SYSTEM_PATHS=TRUE + # 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 \ + -DSETUPTOOLS_DEB_LAYOUT=OFF - make + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |