summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2019-10-11 03:01:20 -0400
committeracxz2019-10-11 03:01:20 -0400
commitb91b5b16a126e7780e7f239d3f0934fd0af24146 (patch)
tree1561ea92b6e208ed34c4f547afab7bf2fe16c657
parent3d01ccf67c331b44a89056563a44a792040d42e1 (diff)
downloadaur-b91b5b16a126e7780e7f239d3f0934fd0af24146.tar.gz
patch boost issue, fix upstream link
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--boost-fix.patch15
3 files changed, 26 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 81bfeef55aa4..5d601c8eb4b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = ros-melodic-cv-bridge
pkgdesc = ROS - This contains CvBridge, which converts between ROS Image messages and OpenCV images.
pkgver = 1.13.0
- pkgrel = 2
- url = https://www.wiki.ros.org/cv_bridge
+ pkgrel = 3
+ url = https://wiki.ros.org/cv_bridge
arch = any
license = BSD
makedepends = cmake
@@ -22,8 +22,10 @@ pkgbase = ros-melodic-cv-bridge
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
+ source = boost-fix.patch
sha256sums = c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59
sha256sums = bc06dbe12f26015c6bce73b2c95123851415d5662c17ef87267737dd433bb22b
+ sha256sums = 50658e5e213df03fa68c51bb399f541699cd022dac4ca68cfcdc19561bcea087
pkgname = ros-melodic-cv-bridge
diff --git a/PKGBUILD b/PKGBUILD
index 418e50858a4e..2c4534954863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,12 @@
# Script generated with import_catkin_packages.py.
# For more information: https://github.com/bchretien/arch-ros-stacks.
pkgdesc="ROS - This contains CvBridge, which converts between ROS Image messages and OpenCV images."
-url='https://www.wiki.ros.org/cv_bridge'
+url='https://wiki.ros.org/cv_bridge'
pkgname='ros-melodic-cv-bridge'
pkgver='1.13.0'
-_pkgver_patch=0
arch=('any')
-pkgrel=2
+pkgrel=3
license=('BSD')
ros_makedepends=(
@@ -41,13 +40,16 @@ depends=(
_dir="vision_opencv-${pkgver}/cv_bridge"
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/vision_opencv/archive/${pkgver}.tar.gz"
- "endian-fix.patch")
+ "endian-fix.patch"
+ "boost-fix.patch")
sha256sums=('c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59'
- 'bc06dbe12f26015c6bce73b2c95123851415d5662c17ef87267737dd433bb22b')
+ 'bc06dbe12f26015c6bce73b2c95123851415d5662c17ef87267737dd433bb22b'
+ '50658e5e213df03fa68c51bb399f541699cd022dac4ca68cfcdc19561bcea087')
prepare() {
cd "${srcdir}/${_dir}"
patch -uN src/module.hpp ../../../endian-fix.patch || return 1
+ patch -uN CMakeLists.txt ../../../boost-fix.patch || return 1
}
build() {
diff --git a/boost-fix.patch b/boost-fix.patch
new file mode 100644
index 000000000000..9f5dea4f35ef
--- /dev/null
+++ b/boost-fix.patch
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig 2019-10-11 02:53:43.966373843 -0400
++++ CMakeLists.txt 2019-10-11 02:53:56.529706619 -0400
+@@ -5,11 +5,7 @@
+
+ if(NOT ANDROID)
+ find_package(PythonLibs)
+- if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
+- find_package(Boost REQUIRED python)
+- else()
+- find_package(Boost REQUIRED python3)
+- endif()
++ find_package(Boost REQUIRED python)
+ else()
+ find_package(Boost REQUIRED)
+ endif()