* update to use ros-drivers release version

2 files changed, 12 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bceee9b5901..8f0e62a18de5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = ros-melodic-libuvc-camera
 	pkgdesc = ROS - USB Video Class camera driver.
 	pkgver = 0.0.10
-	pkgrel = 1
-	url = http://ros.org/wiki/libuvc_camera
+	pkgrel = 2
+	url = https://wiki.ros.org/libuvc_camera
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-camera-info-manager
 	makedepends = ros-melodic-nodelet
 	makedepends = ros-melodic-roscpp
 	makedepends = ros-melodic-libuvc
@@ -15,15 +14,14 @@ pkgbase = ros-melodic-libuvc-camera
 	makedepends = ros-melodic-sensor-msgs
 	makedepends = ros-melodic-image-transport
 	makedepends = ros-melodic-catkin
-	depends = ros-melodic-camera-info-manager
 	depends = ros-melodic-nodelet
 	depends = ros-melodic-roscpp
 	depends = ros-melodic-libuvc
 	depends = ros-melodic-dynamic-reconfigure
 	depends = ros-melodic-sensor-msgs
 	depends = ros-melodic-image-transport
-	source = ros-melodic-libuvc-camera-0.0.10-0.tar.gz::https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/melodic/libuvc_camera/0.0.10-0.tar.gz
-	sha256sums = 3b85b16607514bfd4e5f49d120a5c88e9b69276e250491156f96190fdad3ae57
+	source = ros-melodic-libuvc-camera-0.0.10.tar.gz::https://github.com/ros-drivers/libuvc_ros/archive/0.0.10.tar.gz
+	sha256sums = 33c356df370f548be1dbc1d21a13bf2704b6ea0218f77d3d6f305392266629d3
 
 pkgname = ros-melodic-libuvc-camera
 
diff --git a/PKGBUILD b/PKGBUILD
index a7e0e61c2e76..3519760d4947 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,15 @@
 # Script generated with import_catkin_packages.py
 # For more information: https://github.com/bchretien/arch-ros-stacks
 pkgdesc="ROS - USB Video Class camera driver."
-url='http://ros.org/wiki/libuvc_camera'
+url='https://wiki.ros.org/libuvc_camera'
 
 pkgname='ros-melodic-libuvc-camera'
 pkgver='0.0.10'
-_pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-camera-info-manager
+ros_makedepends=(
   ros-melodic-nodelet
   ros-melodic-roscpp
   ros-melodic-libuvc
@@ -21,7 +20,7 @@ ros_makedepends=(ros-melodic-camera-info-manager
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-camera-info-manager
+ros_depends=(
   ros-melodic-nodelet
   ros-melodic-roscpp
   ros-melodic-libuvc
@@ -30,16 +29,10 @@ ros_depends=(ros-melodic-camera-info-manager
   ros-melodic-image-transport)
 depends=(${ros_depends[@]})
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/libuvc_camera/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-drivers-gbp/libuvc_ros-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
-
-# Tarball version (faster download)
-_dir="libuvc_ros-release-release-melodic-libuvc_camera-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/melodic/libuvc_camera/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('3b85b16607514bfd4e5f49d120a5c88e9b69276e250491156f96190fdad3ae57')
+# use ros-drivers tarball version (faster download)
+_dir="libuvc_ros-${pkgver}/libuvc_camera"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-drivers/libuvc_ros/archive/${pkgver}.tar.gz")
+sha256sums=('33c356df370f548be1dbc1d21a13bf2704b6ea0218f77d3d6f305392266629d3')
 
 build() {
   # Use ROS environment variables