diff options
| author | Oskar Roesler | 2019-09-28 23:39:13 +0200 |
|---|---|---|
| committer | GitHub | 2019-09-28 23:39:13 +0200 |
| commit | 3d01ccf67c331b44a89056563a44a792040d42e1 (patch) | |
| tree | 57b02958e3c84247cf397ba1c81d1e514c15ac91 | |
| parent | 76237fa4497508f02b0388b69c754028886ee9bf (diff) | |
| parent | b1c3793e1e40d2937d6029e00becfdd99e64e799 (diff) | |
| download | aur-3d01ccf67c331b44a89056563a44a792040d42e1.tar.gz | |
Merge pull request #2 from ros-melodic-arch/endian-fix
added patch for endian issue
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | endian-fix.patch | 10 |
3 files changed, 23 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-cv-bridge pkgdesc = ROS - This contains CvBridge, which converts between ROS Image messages and OpenCV images. pkgver = 1.13.0 - pkgrel = 1 + pkgrel = 2 url = https://www.wiki.ros.org/cv_bridge arch = any license = BSD @@ -21,7 +21,9 @@ pkgbase = ros-melodic-cv-bridge depends = python-numpy depends = opencv3-opt source = ros-melodic-cv-bridge-1.13.0.tar.gz::https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz + source = endian-fix.patch sha256sums = c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59 + sha256sums = bc06dbe12f26015c6bce73b2c95123851415d5662c17ef87267737dd433bb22b pkgname = ros-melodic-cv-bridge @@ -7,7 +7,7 @@ pkgname='ros-melodic-cv-bridge' pkgver='1.13.0' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=( @@ -40,8 +40,15 @@ depends=( ) _dir="vision_opencv-${pkgver}/cv_bridge" -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" + "endian-fix.patch") +sha256sums=('c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59' + 'bc06dbe12f26015c6bce73b2c95123851415d5662c17ef87267737dd433bb22b') + +prepare() { + cd "${srcdir}/${_dir}" + patch -uN src/module.hpp ../../../endian-fix.patch || return 1 +} build() { # Use ROS environment variables. diff --git a/endian-fix.patch b/endian-fix.patch new file mode 100644 index 000000000000..c88e50bd58c6 --- /dev/null +++ b/endian-fix.patch @@ -0,0 +1,10 @@ +--- module.hpp.old 2019-09-28 13:24:21.148153374 -0500 ++++ module.hpp 2019-09-28 13:23:55.294215002 -0500 +@@ -37,6 +37,7 @@ + static int do_numpy_import( ) + { + import_array( ); ++ return NULL; + } + #else + static void do_numpy_import( ) |