diff options
| author | Jan-Henrik Bruhn | 2020-05-21 16:08:02 +0200 |
|---|---|---|
| committer | GitHub | 2020-05-21 10:08:02 -0400 |
| commit | ababe5765b272bd524cf37c1669211178f667faa (patch) | |
| tree | 093194877bc67447a6a7fbe93a69fc179b7ab1d7 | |
| parent | 03c9b48e4b61fc28797074966fbef53755599cc0 (diff) | |
| download | aur-ros-melodic-image-geometry.tar.gz | |
Add Patch to explictly use OpenCV3 during build (#2)
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | use-opencv3.patch | 12 |
3 files changed, 24 insertions, 4 deletions
@@ -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 = 3 + pkgrel = 4 url = https://wiki.ros.org/image_geometry arch = any license = BSD @@ -13,7 +13,9 @@ pkgbase = ros-melodic-image-geometry depends = ros-melodic-sensor-msgs 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 + source = use-opencv3.patch sha256sums = c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59 + sha256sums = 8937ccf72a7c463e2525cea0c5a3c1ac7f6ac7ea2b3dde79a929c99b57edb02e pkgname = ros-melodic-image-geometry @@ -4,7 +4,7 @@ url='https://wiki.ros.org/image_geometry' pkgname='ros-melodic-image-geometry' pkgver='1.13.0' arch=('any') -pkgrel='3' +pkgrel='4' license=('BSD') ros_makedepends=( @@ -29,8 +29,14 @@ depends=( ) _dir="vision_opencv-${pkgver}/image_geometry" -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/vision_opencv/archive/${pkgver}.tar.gz") -sha256sums=('c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59') +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/vision_opencv/archive/${pkgver}.tar.gz" "use-opencv3.patch") +sha256sums=('c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59' + '8937ccf72a7c463e2525cea0c5a3c1ac7f6ac7ea2b3dde79a929c99b57edb02e') + +prepare() { + cd "${srcdir}" + patch --forward --strip=1 --input=${srcdir}/use-opencv3.patch || return 1 +} build() { # Use ROS environment variables. diff --git a/use-opencv3.patch b/use-opencv3.patch new file mode 100644 index 000000000000..068bd2af2d28 --- /dev/null +++ b/use-opencv3.patch @@ -0,0 +1,12 @@ +diff --unified --recursive --text package.orig/vision_opencv-1.13.0/image_geometry/CMakeLists.txt package.new/vision_opencv-1.13.0/image_geometry/CMakeLists.txt +--- package.orig/vision_opencv-1.13.0/image_geometry/CMakeLists.txt 2020-05-21 15:32:19.474961287 +0200 ++++ package.new/vision_opencv-1.13.0/image_geometry/CMakeLists.txt 2020-05-21 15:32:33.155009735 +0200 +@@ -2,7 +2,7 @@ + project(image_geometry) + + find_package(catkin REQUIRED sensor_msgs) +-find_package(OpenCV REQUIRED) ++find_package(OpenCV 3 REQUIRED) + + catkin_package(CATKIN_DEPENDS sensor_msgs + DEPENDS OpenCV |