summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD31
2 files changed, 22 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f1406c5648..86d52c26930 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-openni2-launch
+pkgbase = ros-noetic-openni2-launch
pkgdesc = ROS - Launch files to start the openni2_camera drivers using rgbd_launch.
pkgver = 0.4.2
pkgrel = 1
@@ -7,15 +7,15 @@ pkgbase = ros-melodic-openni2-launch
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- depends = ros-melodic-rgbd-launch
- depends = ros-melodic-openni2-camera
- depends = ros-melodic-tf
- depends = ros-melodic-nodelet
- depends = ros-melodic-depth-image-proc
- depends = ros-melodic-image-proc
- source = ros-melodic-openni2-launch-0.4.2.tar.gz::https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-rgbd-launch
+ depends = ros-noetic-openni2-camera
+ depends = ros-noetic-tf
+ depends = ros-noetic-nodelet
+ depends = ros-noetic-depth-image-proc
+ depends = ros-noetic-image-proc
+ source = ros-noetic-openni2-launch-0.4.2.tar.gz::https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz
sha256sums = 98df75bef6d8865eab33ebeaec6b3bd098ca249b18c0e0459221483d51b0d2ca
-pkgname = ros-melodic-openni2-launch
+pkgname = ros-noetic-openni2-launch
diff --git a/PKGBUILD b/PKGBUILD
index ee6a6008e47..d50c7f9a79e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,26 @@
pkgdesc="ROS - Launch files to start the openni2_camera drivers using rgbd_launch."
url='https://wiki.ros.org/openni2_launch'
-pkgname='ros-melodic-openni2-launch'
+pkgname='ros-noetic-openni2-launch'
pkgver='0.4.2'
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-rgbd-launch
- ros-melodic-openni2-camera
- ros-melodic-tf
- ros-melodic-nodelet
- ros-melodic-depth-image-proc
- ros-melodic-image-proc)
+ros_depends=(ros-noetic-rgbd-launch
+ ros-noetic-openni2-camera
+ ros-noetic-tf
+ ros-noetic-nodelet
+ ros-noetic-depth-image-proc
+ ros-noetic-image-proc)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/openni2_launch/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/openni2_launch/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/openni2_launch.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -35,24 +35,17 @@ sha256sums=('98df75bef6d8865eab33ebeaec6b3bd098ca249b18c0e0459221483d51b0d2ca')
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 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.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=.cpython37m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}