diff options
author | acxz | 2019-06-12 20:20:50 -0400 |
---|---|---|
committer | acxz | 2019-06-12 20:20:50 -0400 |
commit | 5e4ed5c4d8036f562d52e6dc73348c06e3323d24 (patch) | |
tree | c3f845abe4d511f28bafcbd47b0fbe85a5faea0b | |
parent | 9f82c533e12b222a33ef14b1987c1a166d4f1db0 (diff) | |
download | aur-5e4ed5c4d8036f562d52e6dc73348c06e3323d24.tar.gz |
Updated package verison, changed source to official source and patched opencv issue
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | CMakeLists-opencv.patch | 11 | ||||
-rw-r--r-- | PKGBUILD | 16 |
3 files changed, 27 insertions, 8 deletions
@@ -1,6 +1,6 @@ pkgbase = ros-melodic-image-view pkgdesc = ROS - A simple viewer for ROS image topics. - pkgver = 1.12.23 + pkgver = 1.13.0 pkgrel = 1 url = http://www.ros.org/wiki/image_view arch = any @@ -31,8 +31,10 @@ pkgbase = ros-melodic-image-view depends = ros-melodic-message-filters depends = ros-melodic-image-transport depends = gtk2 - source = ros-melodic-image-view-1.12.23-0.tar.gz::https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_view/1.12.23-0.tar.gz - sha256sums = db828d83d6f3afbd0b9478c6311ea0da425a062269e91a001da1aaadcdabd5b4 + source = ros-melodic-image-view-1.13.0.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.13.0.tar.gz + source = CMakeLists-opencv.patch + sha256sums = 3c2309d421acf354ca69a7c814ceec7c8b24732c31a7f1c47a055aedd95cb1c4 + sha256sums = d5525cc488989fbc49e151eccbc790888ec73c781ff1ab43e559e2c70f1b86d3 pkgname = ros-melodic-image-view diff --git a/CMakeLists-opencv.patch b/CMakeLists-opencv.patch new file mode 100644 index 000000000000..a5dc3fbd06e8 --- /dev/null +++ b/CMakeLists-opencv.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.old 2019-06-12 20:01:41.573303352 -0400 ++++ CMakeLists.txt 2019-06-12 20:02:38.589967493 -0400 +@@ -6,7 +6,7 @@ + + catkin_package(CATKIN_DEPENDS dynamic_reconfigure) + find_package(Boost REQUIRED COMPONENTS thread) +-find_package(OpenCV REQUIRED) ++find_package(OpenCV 3 REQUIRED) + + include_directories(${Boost_INCLUDE_DIRS} + ${catkin_INCLUDE_DIRS} @@ -4,8 +4,7 @@ pkgdesc="ROS - A simple viewer for ROS image topics." url='http://www.ros.org/wiki/image_view' pkgname='ros-melodic-image-view' -pkgver='1.12.23' -_pkgver_patch=0 +pkgver='1.13.0' arch=('any') pkgrel=1 license=('BSD') @@ -50,9 +49,16 @@ depends=( gtk2 ) -_dir="image_pipeline-release-release-melodic-image_view-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_view/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('db828d83d6f3afbd0b9478c6311ea0da425a062269e91a001da1aaadcdabd5b4') +_dir="image_pipeline-${pkgver}/image_view" +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/image_pipeline/archive/${pkgver}.tar.gz" + CMakeLists-opencv.patch) +sha256sums=('3c2309d421acf354ca69a7c814ceec7c8b24732c31a7f1c47a055aedd95cb1c4' + 'd5525cc488989fbc49e151eccbc790888ec73c781ff1ab43e559e2c70f1b86d3') + +prepare() { + cd "${srcdir}/${_dir}" + patch -uN CMakeLists.txt ../../../CMakeLists-opencv.patch || return 1 +} build() { # Use ROS environment variables. |