summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Exner2021-01-27 21:29:18 +0100
committerFelix Exner2021-01-27 21:32:44 +0100
commitb367aedd709928de29ed1ac5fa7471cca5abaf1b (patch)
tree285cafab7851db5b39e054244c514de2439a2bea
parent633dcc234a307c0e7efa0706fe258d0a475df791 (diff)
downloadaur-b367aedd709928de29ed1ac5fa7471cca5abaf1b.tar.gz
Update package
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD91
2 files changed, 48 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 882268d9000d..8d443ccbd181 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-interactive-marker-twist-server
pkgdesc = ROS - Interactive control for generic Twist-based robots using interactive markers.
- pkgver = 1.2.0
- pkgrel = 3
+ pkgver = 1.2.1
+ pkgrel = 1
url = h
arch = i686
arch = x86_64
@@ -19,8 +19,8 @@ pkgbase = ros-melodic-interactive-marker-twist-server
depends = ros-melodic-interactive-markers
depends = ros-melodic-visualization-msgs
depends = ros-melodic-roscpp
- source = ros-melodic-interactive-marker-twist-server-1.2.0.tar.gz::https://github.com/ros-visualization/interactive_marker_twist_server/archive/1.2.0.tar.gz
- sha256sums = 00fda96ab6adf73e8f61299334443a00a9d1eb00ff0727fe49dea6c6189bf889
+ source = ros-melodic-interactive-marker-twist-server-1.2.1.tar.gz::https://github.com/ros-visualization/interactive_marker_twist_server/archive/1.2.1.tar.gz
+ sha256sums = c4d7354741eb866c10b69a4512d7e71ea5ccadc7800a230ed7373059c474ecd7
pkgname = ros-melodic-interactive-marker-twist-server
diff --git a/PKGBUILD b/PKGBUILD
index 277d8d546682..2e03bb1d5044 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,60 @@
# Script generated with create_pkgbuild.py
- # For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
- pkgdesc="ROS - Interactive control for generic Twist-based robots using interactive markers."
- url='h'
+# For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
+pkgdesc="ROS - Interactive control for generic Twist-based robots using interactive markers."
+url='h'
- pkgname='ros-melodic-interactive-marker-twist-server'
- pkgver='1.2.0'
- arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
- pkgrel=3
- license=('BSD')
+pkgname='ros-melodic-interactive-marker-twist-server'
+pkgver='1.2.1'
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
+pkgrel=1
+license=('BSD')
- ros_makedepends=(ros-melodic-interactive-markers
+ros_makedepends=(ros-melodic-interactive-markers
ros-melodic-visualization-msgs
ros-melodic-roscpp
ros-melodic-catkin
ros-melodic-roslint
)
- makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]}
- )
+makedepends=('cmake' 'ros-build-tools'
+${ros_makedepends[@]}
+)
- ros_depends=(ros-melodic-interactive-markers
+ros_depends=(ros-melodic-interactive-markers
ros-melodic-visualization-msgs
ros-melodic-roscpp)
- depends=(${ros_depends[@]}
+depends=(${ros_depends[@]}
)
- # Tarball version (faster download)
-_dir="interactive_marker_twist_server-${pkgver}"
+# Tarball version (faster download)
+_dir="interactive_marker_twist_server-${pkgver}/"
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/interactive_marker_twist_server/archive/${pkgver}.tar.gz")
-sha256sums=('00fda96ab6adf73e8f61299334443a00a9d1eb00ff0727fe49dea6c6189bf889')
-
-
- 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 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 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=.cpython-38m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
+sha256sums=('c4d7354741eb866c10b69a4512d7e71ea5ccadc7800a230ed7373059c474ecd7')
+
+
+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 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 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
- }
+}
+
+package() {
+cd "${srcdir}/build"
+make DESTDIR="${pkgdir}/" install
+}
- package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
- }
-