diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | geographiclib.patch | 11 |
3 files changed, 4 insertions, 24 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-robot-localization pkgdesc = ROS - The robot_localization package provides nonlinear state estimation through sensor fusion of an abritrary number of sensors. pkgver = 2.6.10 - pkgrel = 1 + pkgrel = 2 url = https://wiki.ros.org/robot_localization arch = i686 arch = x86_64 @@ -51,8 +51,6 @@ pkgbase = ros-melodic-robot-localization depends = eigen depends = yaml-cpp source = ros-melodic-robot-localization-2.6.10.tar.gz::https://github.com/cra-ros-pkg/robot_localization/archive/2.6.10.tar.gz - source = geographiclib.patch sha256sums = 1b1a6bc525ed6496e5efecd0c035913f2cb3276069f5c8207382f62c9cb5c4c3 - sha256sums = 7efe1f393789f127bcc7e875f19153dbc1762a451c27db1edcb6ac82276c7d16 pkgname = ros-melodic-robot-localization @@ -5,7 +5,7 @@ url='https://wiki.ros.org/robot_localization' pkgname='ros-melodic-robot-localization' pkgver='2.6.10' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=(ros-melodic-tf2-ros @@ -54,15 +54,8 @@ depends=(${ros_depends[@]} yaml-cpp) _dir="robot_localization-${pkgver}/" -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/cra-ros-pkg/robot_localization/archive/${pkgver}.tar.gz" -geographiclib.patch) -sha256sums=('1b1a6bc525ed6496e5efecd0c035913f2cb3276069f5c8207382f62c9cb5c4c3' - '7efe1f393789f127bcc7e875f19153dbc1762a451c27db1edcb6ac82276c7d16') - -prepare() { - cd ${srcdir}/${_dir} - patch -uN CMakeLists.txt ${srcdir}/geographiclib.patch || return 1 -} +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/cra-ros-pkg/robot_localization/archive/${pkgver}.tar.gz") +sha256sums=('1b1a6bc525ed6496e5efecd0c035913f2cb3276069f5c8207382f62c9cb5c4c3') build() { # Use ROS environment variables diff --git a/geographiclib.patch b/geographiclib.patch deleted file mode 100644 index f0f730f1f305..000000000000 --- a/geographiclib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2021-01-01 11:17:56.709028293 +0100 -+++ CMakeLists.txt 2021-01-01 11:08:50.002805380 +0100 -@@ -32,7 +32,7 @@ - - # Geographiclib installs FindGeographicLib.cmake to this non-standard location - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/cmake/geographiclib/") --find_package(GeographicLib REQUIRED COMPONENTS STATIC) -+find_package(GeographicLib REQUIRED) - - # Attempt to find Eigen using its own CMake module. - # If that fails, fall back to cmake_modules package. |