summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242020-01-14 21:04:04 +0100
committerbionade242020-01-14 21:04:04 +0100
commit03c9b48e4b61fc28797074966fbef53755599cc0 (patch)
tree948afa65f46323e639ca5b852fc36b01a3b8a8a7
parent449cd0dcc66d4e4e04db2aecf21e5260b935550e (diff)
downloadaur-03c9b48e4b61fc28797074966fbef53755599cc0.tar.gz
Change to opencv3 package
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
2 files changed, 8 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 288b9e57a67c..4a68a5cf4724 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-image-geometry
pkgdesc = ROS - image_geometry contains C++ and Python libraries for interpreting images geometrically.
pkgver = 1.13.0
- pkgrel = 2
+ pkgrel = 3
url = https://wiki.ros.org/image_geometry
arch = any
license = BSD
@@ -9,9 +9,9 @@ pkgbase = ros-melodic-image-geometry
makedepends = ros-build-tools
makedepends = ros-melodic-sensor-msgs
makedepends = ros-melodic-catkin
- makedepends = opencv
+ makedepends = opencv3-opt
depends = ros-melodic-sensor-msgs
- depends = opencv
+ depends = opencv3-opt
source = ros-melodic-image-geometry-1.13.0.tar.gz::https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz
sha256sums = c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59
diff --git a/PKGBUILD b/PKGBUILD
index e03e50698d9e..7958004d8ac8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,10 @@
-# Script generated with import_catkin_packages.py.
-# For more information: https://github.com/bchretien/arch-ros-stacks.
pkgdesc="ROS - image_geometry contains C++ and Python libraries for interpreting images geometrically."
url='https://wiki.ros.org/image_geometry'
pkgname='ros-melodic-image-geometry'
pkgver='1.13.0'
-_pkgver_patch=0
arch=('any')
-pkgrel=2
+pkgrel='3'
license=('BSD')
ros_makedepends=(
@@ -18,8 +15,8 @@ ros_makedepends=(
makedepends=(
'cmake'
'ros-build-tools'
- ${ros_makedepends[@]}
- opencv
+ "${ros_makedepends[@]}"
+ 'opencv3-opt'
)
ros_depends=(
@@ -27,8 +24,8 @@ ros_depends=(
)
depends=(
- ${ros_depends[@]}
- opencv
+ "${ros_depends[@]}"
+ "opencv3-opt"
)
_dir="vision_opencv-${pkgver}/image_geometry"
@@ -53,9 +50,6 @@ build() {
-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 \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}