summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD39
2 files changed, 24 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5157bffec07..f3930116de1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
pkgbase = hpp-fcl
pkgdesc = An extension of the Flexible Collision Library
- pkgver = 1.7.8
- pkgrel = 3
+ pkgver = 1.8.0
+ pkgrel = 1
url = https://github.com/humanoid-path-planner/hpp-fcl
arch = i686
arch = x86_64
license = BSD
makedepends = cmake
makedepends = eigen
+ makedepends = boost
depends = assimp
+ depends = boost-libs
depends = eigenpy
depends = octomap
depends = qhull
optdepends = doxygen
- source = https://github.com/humanoid-path-planner/hpp-fcl/releases/download/v1.7.8/hpp-fcl-1.7.8.tar.gz
- source = https://github.com/humanoid-path-planner/hpp-fcl/releases/download/v1.7.8/hpp-fcl-1.7.8.tar.gz.sig
+ source = https://github.com/humanoid-path-planner/hpp-fcl/releases/download/v1.8.0/hpp-fcl-1.8.0.tar.gz
+ source = https://github.com/humanoid-path-planner/hpp-fcl/releases/download/v1.8.0/hpp-fcl-1.8.0.tar.gz.sig
validpgpkeys = 9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28
validpgpkeys = A031AD35058955293D54DECEC45D22EF408328AD
- sha256sums = SKIP
+ sha256sums = 908cf7902f79db7103f8c9fb980e75bb8172d11d121c17899e616145087d1ab1
sha256sums = SKIP
pkgname = hpp-fcl
diff --git a/PKGBUILD b/PKGBUILD
index 09cf7513dbdd..f88ff1466c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,49 +3,44 @@
pkgorg='humanoid-path-planner'
_pkgname='hpp-fcl'
pkgname=("$_pkgname" "$_pkgname-docs")
-pkgver=1.7.8
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
pkgdesc="An extension of the Flexible Collision Library"
arch=('i686' 'x86_64')
url="https://github.com/$pkgorg/$pkgname"
license=('BSD')
-depends=('assimp' 'eigenpy' 'octomap' 'qhull')
+depends=('assimp' 'boost-libs' 'eigenpy' 'octomap' 'qhull')
optdepends=('doxygen')
-makedepends=('cmake' 'eigen')
-source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig})
-sha256sums=('SKIP' 'SKIP')
+makedepends=('cmake' 'eigen' 'boost')
+source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.sig})
+sha256sums=('908cf7902f79db7103f8c9fb980e75bb8172d11d121c17899e616145087d1ab1'
+ 'SKIP')
validpgpkeys=('9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28' 'A031AD35058955293D54DECEC45D22EF408328AD')
build() {
- cd "$pkgbase-$pkgver"
-
- cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
+ cmake -B "build-$pkgver" -S "$pkgbase-$pkgver" \
-DCMAKE_CXX_STANDARD=14 \
-DHPP_FCL_HAS_QHULL=ON \
- .
- make
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build "build-$pkgver"
}
check() {
- cd "$pkgbase-$pkgver"
- make test
+ cmake --build "build-$pkgver" -t test
}
package_hpp-fcl() {
- cd "$pkgbase-$pkgver"
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir/" cmake --build "build-$pkgver" -t install
rm -rf "$pkgdir/usr/share/doc"
sed -i 's=;/usr/\.\./include/include==' "$pkgdir/usr/lib/cmake/hpp-fcl/hpp-fclTargets.cmake"
sed -i '/Boost COMPONENTS/s/python3//' "$pkgdir/usr/lib/cmake/hpp-fcl/hpp-fclConfig.cmake"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$pkgbase-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_hpp-fcl-docs() {
- cd "$pkgbase-$pkgver"
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir/" cmake --build "build-$pkgver" -t install
rm -rf "$pkgdir"/usr/{lib,include,"share/$_pkgname"}
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$pkgbase-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}