summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD23
2 files changed, 12 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c7e40feed09..b4cd40644a2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-libuvc
+pkgbase = ros-noetic-libuvc
pkgdesc = ROS - USB Video Class driver library.
pkgver = 0.0.6
pkgrel = 2
@@ -8,10 +8,10 @@ pkgbase = ros-melodic-libuvc
makedepends = cmake
makedepends = ros-build-tools
makedepends = libusb
- depends = ros-melodic-catkin
+ depends = ros-noetic-catkin
depends = libusb
- source = ros-melodic-libuvc-0.0.6-0.tar.gz::https://github.com/ktossell/libuvc-release/archive/release/melodic/libuvc/0.0.6-0.tar.gz
+ source = ros-noetic-libuvc-0.0.6-0.tar.gz::https://github.com/ktossell/libuvc-release/archive/release/noetic/libuvc/0.0.6-0.tar.gz
sha256sums = 06a553e6d043735a10fff606d5f71a20661fc9b6be392b69a06c35b8aca8d3f6
-pkgname = ros-melodic-libuvc
+pkgname = ros-noetic-libuvc
diff --git a/PKGBUILD b/PKGBUILD
index c99c69aa80de..8c802927e688 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - USB Video Class driver library."
url='https://github.com/ktossell/libuvc'
-pkgname='ros-melodic-libuvc'
+pkgname='ros-noetic-libuvc'
pkgver='0.0.6'
_pkgver_patch=0
arch=('any')
@@ -16,42 +16,35 @@ makedepends=('cmake'
${ros_makedepends[@]}
libusb)
-ros_depends=(ros-melodic-catkin)
+ros_depends=(ros-noetic-catkin)
depends=(${ros_depends[@]}
libusb)
# Git version (e.g. for debugging)
-# _tag=release/melodic/libuvc/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/libuvc/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ktossell/libuvc-release.git"#tag=${_tag})
# sha256sums=('SKIP')
# Tarball version (faster download)
-_dir="libuvc-release-release-melodic-libuvc-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ktossell/libuvc-release/archive/release/melodic/libuvc/${pkgver}-${_pkgver_patch}.tar.gz")
+_dir="libuvc-release-release-noetic-libuvc-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ktossell/libuvc-release/archive/release/noetic/libuvc/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('06a553e6d043735a10fff606d5f71a20661fc9b6be392b69a06c35b8aca8d3f6')
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=.cpython3.7m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}