summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKino2024-05-19 21:12:27 +0800
committerKino2024-05-19 21:12:27 +0800
commit092f9311a73a00f1edc3465c00bfcd053656e135 (patch)
tree5dfa0bfade9db5c671012b771a37c3f3d26d8a08
parent6f288749deee15289f09c40e275ebf12d1b61751 (diff)
downloadaur-092f9311a73a00f1edc3465c00bfcd053656e135.tar.gz
upgpkg: 3.2.1-6; try to fix test error
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3cbdbbe76837..350fc669c56f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros2-humble-cv-bridge
pkgdesc = This contains CvBridge, which converts between ROS Image messages and OpenCV images.
pkgver = 3.2.1
- pkgrel = 5
+ pkgrel = 6
url = https://index.ros.org/p/cv_bridge/
arch = any
license = Apache-2.0
diff --git a/PKGBUILD b/PKGBUILD
index 4a21c23c97b9..5a9ee304328a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgroot=vision_opencv
_pkgname=cv_bridge
pkgname=ros2-humble-cv-bridge
pkgver=3.2.1
-pkgrel=5
+pkgrel=6
pkgdesc="This contains CvBridge, which converts between ROS Image messages and OpenCV images."
url="https://index.ros.org/p/cv_bridge/"
license=('Apache-2.0' 'BSD-3-Clause')
@@ -21,20 +21,22 @@ prepare() {
source /opt/ros/humble/setup.bash
python -m venv venv/opt/ros/humble --system-site-packages
export LD_LIBRARY_PATH=$PWD/venv/opt/ros/humble/lib:$LD_LIBRARY_PATH
- source venv/opt/ros/humble/bin/activate
}
build() {
+ source build/venv/opt/ros/humble/bin/activate
cmake -B build -S "$_pkgroot-$pkgver/$_pkgname" \
-DCMAKE_BUILD_TYPE='None' \
-DCMAKE_INSTALL_PREFIX='/opt/ros/humble' \
-Wno-dev
cmake --build build
+ deactivate
}
check() {
cd $srcdir/build
cmake --install . --prefix venv/opt/ros/humble
+ source venv/opt/ros/humble/bin/activate
ctest -vv --output-on-failue
deactivate
}