summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD38
2 files changed, 33 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51f3277ddbe..186fd143ca1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rqt-image-view
+pkgbase = ros-noetic-rqt-image-view
pkgdesc = ROS - rqt_image_view provides a GUI plugin for displaying images using image_transport.
pkgver = 0.4.13
pkgrel = 4
@@ -11,24 +11,24 @@ pkgbase = ros-melodic-rqt-image-view
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-rqt-gui-cpp
- makedepends = ros-melodic-geometry-msgs
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-cv-bridge
- makedepends = ros-melodic-rqt-gui
- makedepends = ros-melodic-sensor-msgs
- makedepends = ros-melodic-image-transport
+ makedepends = ros-noetic-rqt-gui-cpp
+ makedepends = ros-noetic-geometry-msgs
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-cv-bridge
+ makedepends = ros-noetic-rqt-gui
+ makedepends = ros-noetic-sensor-msgs
+ makedepends = ros-noetic-image-transport
makedepends = qt5-base
- depends = ros-melodic-rqt-gui-cpp
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-cv-bridge
- depends = ros-melodic-rqt-gui
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-image-transport
- source = ros-melodic-rqt-image-view-0.4.13.tar.gz::https://github.com/ros-visualization/rqt_image_view/archive/0.4.13.tar.gz
+ depends = ros-noetic-rqt-gui-cpp
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-cv-bridge
+ depends = ros-noetic-rqt-gui
+ depends = ros-noetic-sensor-msgs
+ depends = ros-noetic-image-transport
+ source = ros-noetic-rqt-image-view-0.4.13.tar.gz::https://github.com/ros-visualization/rqt_image_view/archive/0.4.13.tar.gz
source = include_QSet.patch
sha256sums = e24e26dc98404966cc827a4e576a3c7465d82076095d1831eb9da49d3a97c4d5
sha256sums = c6a8079a952d8ee9560d190e27f124f53c0e78b4d80ec46bbe06ae36f1de85b7
-pkgname = ros-melodic-rqt-image-view
+pkgname = ros-noetic-rqt-image-view
diff --git a/PKGBUILD b/PKGBUILD
index c4dabd50f5e..371bafa3d09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
pkgdesc="ROS - rqt_image_view provides a GUI plugin for displaying images using image_transport."
url='https://wiki.ros.org/rqt_image_view'
-pkgname='ros-melodic-rqt-image-view'
+pkgname='ros-noetic-rqt-image-view'
pkgver='0.4.13'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=4
license=('BSD')
ros_makedepends=(
- ros-melodic-rqt-gui-cpp
- ros-melodic-geometry-msgs
- ros-melodic-catkin
- ros-melodic-cv-bridge
- ros-melodic-rqt-gui
- ros-melodic-sensor-msgs
- ros-melodic-image-transport
+ ros-noetic-rqt-gui-cpp
+ ros-noetic-geometry-msgs
+ ros-noetic-catkin
+ ros-noetic-cv-bridge
+ ros-noetic-rqt-gui
+ ros-noetic-sensor-msgs
+ ros-noetic-image-transport
)
makedepends=(
@@ -25,12 +25,12 @@ makedepends=(
)
ros_depends=(
- ros-melodic-rqt-gui-cpp
- ros-melodic-geometry-msgs
- ros-melodic-cv-bridge
- ros-melodic-rqt-gui
- ros-melodic-sensor-msgs
- ros-melodic-image-transport
+ ros-noetic-rqt-gui-cpp
+ ros-noetic-geometry-msgs
+ ros-noetic-cv-bridge
+ ros-noetic-rqt-gui
+ ros-noetic-sensor-msgs
+ ros-noetic-image-transport
)
depends=(
@@ -51,21 +51,17 @@ prepare() {
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
}