Harcode boost 1.69

3 files changed, 14 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 632592b4dd59..2f30030a23f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-camera-calibration-parsers
 	pkgdesc = ROS - camera_calibration_parsers contains routines for reading and writing camera calibration parameters.
 	pkgver = 1.11.13
-	pkgrel = 6
+	pkgrel = 7
 	url = https://wiki.ros.org/camera_calibration_parsers
 	arch = i686
 	arch = x86_64
@@ -17,17 +17,17 @@ pkgbase = ros-melodic-camera-calibration-parsers
 	makedepends = ros-melodic-roscpp-serialization
 	makedepends = ros-melodic-sensor-msgs
 	makedepends = yaml-cpp
-	makedepends = boost
+	makedepends = boost1.69
+	makedepends = boost1.69-libs
 	makedepends = pkg-config
 	depends = ros-melodic-sensor-msgs
 	depends = ros-melodic-roscpp
 	depends = ros-melodic-roscpp-serialization
-	depends = boost
+	depends = boost1.69
+	depends = boost1.69-libs
 	depends = yaml-cpp
 	source = ros-melodic-camera-calibration-parsers-1.11.13.tar.gz::https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz
-	source = boost-fix.patch
 	sha256sums = 32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac
-	sha256sums = 85b506e095b95e6382b816625e798444c83e77f52eef8c98ed0182ef59d326d4
 
 pkgname = ros-melodic-camera-calibration-parsers
 
diff --git a/PKGBUILD b/PKGBUILD
index 177951161221..ec994b454539 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,10 @@
-# Script generated with import_catkin_packages.py.
-# For more information: https://github.com/bchretien/arch-ros-stacks.
 pkgdesc="ROS - camera_calibration_parsers contains routines for reading and writing camera calibration parameters."
 url='https://wiki.ros.org/camera_calibration_parsers'
 
 pkgname='ros-melodic-camera-calibration-parsers'
 pkgver='1.11.13'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=6
+pkgrel=7
 license=('BSD')
 
 ros_makedepends=(
@@ -22,7 +20,8 @@ makedepends=(
 	'ros-build-tools'
 	${ros_makedepends[@]}
 	yaml-cpp
-	boost
+	boost1.69
+	boost1.69-libs
 	pkg-config
 )
 
@@ -34,20 +33,14 @@ ros_depends=(
 
 depends=(
 	${ros_depends[@]}
-	boost
+	boost1.69
+	boost1.69-libs
 	yaml-cpp
 )
 
 _dir="image_common-${pkgver}/camera_calibration_parsers"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/image_common/archive/${pkgver}.tar.gz"
-    "boost-fix.patch")
-sha256sums=('32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac'
-            '85b506e095b95e6382b816625e798444c83e77f52eef8c98ed0182ef59d326d4')
-
-prepare() {
-    cd "${srcdir}/${_dir}"
-    patch -uN CMakeLists.txt ${srcdir}/boost-fix.patch || return 1
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/image_common/archive/${pkgver}.tar.gz")
+sha256sums=('32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac')
 
 build() {
 	# Use ROS environment variables.
@@ -67,7 +60,8 @@ build() {
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
 		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DSETUPTOOLS_DEB_LAYOUT=OFF
+		-DSETUPTOOLS_DEB_LAYOUT=OFF \
+	   	-DBOOST_ROOT=/opt/boost1.69
 	make
 }
 
diff --git a/boost-fix.patch b/boost-fix.patch
deleted file mode 100644
index 985ad85dc7e5..000000000000
--- a/boost-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- CMakeLists.txt.orig	2019-10-12 00:51:32.023316775 -0400
-+++ CMakeLists.txt	2019-10-12 00:51:45.049983337 -0400
-@@ -4,11 +4,7 @@
- find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization)
- 
- find_package(PythonLibs REQUIRED)
--if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
--  find_package(Boost REQUIRED COMPONENTS filesystem python)
--else()
--  find_package(Boost REQUIRED COMPONENTS filesystem python3)
--endif()
-+find_package(Boost REQUIRED COMPONENTS filesystem python)
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
- 
- catkin_python_setup()