upd to noetic, cmake vars, python

3 files changed, 30 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebc6b2de20b4..0f97e60a8aff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-camera-calibration-parsers
+pkgbase = ros-noetic-camera-calibration-parsers
 	pkgdesc = ROS - camera_calibration_parsers contains routines for reading and writing camera calibration parameters.
-	pkgver = 1.11.13
-	pkgrel = 5
+	pkgver = 1.12.0
+	pkgrel = 1
 	url = https://wiki.ros.org/camera_calibration_parsers
 	arch = i686
 	arch = x86_64
@@ -11,23 +11,21 @@ pkgbase = ros-melodic-camera-calibration-parsers
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-roscpp-serialization
-	makedepends = ros-melodic-sensor-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-roscpp-serialization
+	makedepends = ros-noetic-sensor-msgs
 	makedepends = yaml-cpp
 	makedepends = boost
 	makedepends = pkg-config
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-roscpp-serialization
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-roscpp-serialization
 	depends = boost
 	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
+	source = ros-noetic-camera-calibration-parsers-1.12.0.tar.gz::https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz
+	sha256sums = ba2e3c0beda22a4bb517ffc2d2a8782c564b8f100286043b9782004d1a87de8e
 
-pkgname = ros-melodic-camera-calibration-parsers
+pkgname = ros-noetic-camera-calibration-parsers
 
diff --git a/PKGBUILD b/PKGBUILD
index 4ffc27ee0e18..e54757c9240a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,18 @@
 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'
+pkgname='ros-noetic-camera-calibration-parsers'
+pkgver='1.12.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=5
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-roscpp-serialization
-	ros-melodic-sensor-msgs
+	ros-noetic-catkin
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-roscpp-serialization
+	ros-noetic-sensor-msgs
 )
 
 makedepends=(
@@ -27,9 +27,9 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-sensor-msgs
-	ros-melodic-roscpp
-	ros-melodic-roscpp-serialization
+	ros-noetic-sensor-msgs
+	ros-noetic-roscpp
+	ros-noetic-roscpp-serialization
 )
 
 depends=(
@@ -39,34 +39,23 @@ depends=(
 )
 
 _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 ../../../boost-fix.patch || return 1
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/image_common/archive/${pkgver}.tar.gz")
+sha256sums=('ba2e3c0beda22a4bb517ffc2d2a8782c564b8f100286043b9782004d1a87de8e')
 
 build() {
 	# Use ROS environment variables.
 	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
 	# Create the build directory.
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	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()