diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
2 files changed, 9 insertions, 16 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-media-export +pkgbase = ros-noetic-media-export pkgdesc = ROS - Placeholder package enabling generic export of media paths. pkgver = 0.2.0 pkgrel = 2 @@ -7,9 +7,9 @@ pkgbase = ros-melodic-media-export license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - source = ros-melodic-media-export-0.2.0.tar.gz::https://github.com/ros/media_export/archive/0.2.0.tar.gz + makedepends = ros-noetic-catkin + source = ros-noetic-media-export-0.2.0.tar.gz::https://github.com/ros/media_export/archive/0.2.0.tar.gz sha256sums = ff340b95693331ddbd493ac2169a3a70192be2e862456ee6bb4cac6421bd3702 -pkgname = ros-melodic-media-export +pkgname = ros-noetic-media-export @@ -3,7 +3,7 @@ pkgdesc="ROS - Placeholder package enabling generic export of media paths." url='https://wiki.ros.org/media_export' -pkgname='ros-melodic-media-export' +pkgname='ros-noetic-media-export' pkgver='0.2.0' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -34,24 +34,17 @@ sha256sums=('ff340b95693331ddbd493ac2169a3a70192be2e862456ee6bb4cac6421bd3702') 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 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |