summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:56:11 -0400
committeracxz2020-05-24 11:56:11 -0400
commit10a800672def05bdd9d485d22e4b0bec05993990 (patch)
tree288ea1ce684d6cbb713e2a870627536bc4553eee
parent69aecb01adc41c15f24539ff3e5ad00bcc7951b8 (diff)
downloadaur-10a800672def05bdd9d485d22e4b0bec05993990.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 130bb1a557f..6084f7b9fe5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-media-export
+pkgbase = ros-noetic-media-export
pkgdesc = ROS - Placeholder package enabling generic export of media paths.
pkgver = 0.2.0
pkgrel = 2
@@ -7,9 +7,9 @@ pkgbase = ros-melodic-media-export
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- source = ros-melodic-media-export-0.2.0.tar.gz::https://github.com/ros/media_export/archive/0.2.0.tar.gz
+ makedepends = ros-noetic-catkin
+ source = ros-noetic-media-export-0.2.0.tar.gz::https://github.com/ros/media_export/archive/0.2.0.tar.gz
sha256sums = ff340b95693331ddbd493ac2169a3a70192be2e862456ee6bb4cac6421bd3702
-pkgname = ros-melodic-media-export
+pkgname = ros-noetic-media-export
diff --git a/PKGBUILD b/PKGBUILD
index 188e1f46ae1..e0746f434dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - Placeholder package enabling generic export of media paths."
url='https://wiki.ros.org/media_export'
-pkgname='ros-melodic-media-export'
+pkgname='ros-noetic-media-export'
pkgver='0.2.0'
_pkgver_patch=0
arch=('any')
@@ -11,7 +11,7 @@ pkgrel=2
license=('BSD')
ros_makedepends=(
- ros-melodic-catkin
+ ros-noetic-catkin
)
makedepends=(
@@ -34,24 +34,17 @@ sha256sums=('ff340b95693331ddbd493ac2169a3a70192be2e862456ee6bb4cac6421bd3702')
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 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=.cpython-37m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}