Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #2 from ros-melodic-arch/endian-fix
Browse files Browse the repository at this point in the history
added patch for endian issue
  • Loading branch information
bionade24 authored Sep 28, 2019
2 parents 76237fa + b1c3793 commit 3d01ccf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .SRCINFO
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

13 changes: 10 additions & 3 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions endian-fix.patch
Original file line number Diff line number Diff line change
@@ -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( )

0 comments on commit 3d01ccf

Please sign in to comment.