updpkg

4 files changed, 25 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e806f302aed7..7dc5ef43b186 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-noetic-cv-bridge
 	pkgdesc = ROS - This contains CvBridge, which converts between ROS Image messages and OpenCV images.
-	pkgver = 1.13.0
-	pkgrel = 5
+	pkgver = 1.15.0
+	pkgrel = 1
 	url = https://wiki.ros.org/cv_bridge
 	arch = i686
 	arch = x86_64
@@ -11,25 +11,23 @@ pkgbase = ros-noetic-cv-bridge
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-noetic-sensor-msgs
-	makedepends = ros-noetic-rosconsole
 	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-rostest
 	makedepends = boost
+	makedepends = opencv
 	makedepends = python
+	makedepends = python-opencv-python
 	makedepends = python-numpy
-	makedepends = opencv3-opt
-	depends = ros-noetic-sensor-msgs
 	depends = ros-noetic-rosconsole
+	depends = ros-noetic-sensor-msgs
 	depends = boost
+	depends = opencv
 	depends = python
-	depends = python-numpy
-	depends = opencv3-opt
-	source = ros-noetic-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
+	depends = python-opencv-python
+	source = ros-noetic-cv-bridge-1.15.0.tar.gz::https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz
+	sha256sums = dc7faaefeb6dfacbea9479e074a544c9f4df690e0b6910155df8542507b5604c
 
 pkgname = ros-noetic-cv-bridge
 
diff --git a/PKGBUILD b/PKGBUILD
index 0a9624b8ebf6..78668ccb9dc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,16 @@ pkgdesc="ROS - This contains CvBridge, which converts between ROS Image messages
 url='https://wiki.ros.org/cv_bridge'
 
 pkgname='ros-noetic-cv-bridge'
-pkgver='1.13.0'
+pkgver='1.15.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=5
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-noetic-sensor-msgs
-	ros-noetic-rosconsole
 	ros-noetic-catkin
+	ros-noetic-rosconsole
+	ros-noetic-sensor-msgs
+    ros-noetic-rostest
 )
 
 makedepends=(
@@ -20,37 +21,28 @@ makedepends=(
 	'ros-build-tools'
 	${ros_makedepends[@]}
 	boost
+	opencv
 	python
-	python-numpy
-	opencv3-opt
+    python-opencv-python
+    python-numpy
 )
 
 ros_depends=(
-	ros-noetic-sensor-msgs
 	ros-noetic-rosconsole
+	ros-noetic-sensor-msgs
 )
 
 depends=(
 	${ros_depends[@]}
 	boost
+    opencv
 	python
-	python-numpy
-	opencv3-opt
+	python-opencv-python
 )
 
 _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"
-  "boost-fix.patch")
-sha256sums=('c8db35dbb6b470cdedb45195f725bc2cfda7f0dc3155e16a5a37e4b48e29fa59'
-  '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
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/vision_opencv/archive/${pkgver}.tar.gz")
+sha256sums=('dc7faaefeb6dfacbea9479e074a544c9f4df690e0b6910155df8542507b5604c')
 
 build() {
 	# Use ROS environment variables.
diff --git a/boost-fix.patch b/boost-fix.patch
deleted file mode 100644
index 9f5dea4f35ef..000000000000
--- a/boost-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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()
diff --git a/endian-fix.patch b/endian-fix.patch
deleted file mode 100644
index c88e50bd58c6..000000000000
--- a/endian-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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( )