summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Saurel2020-06-18 10:46:36 +0200
committerGuilhem Saurel2020-06-18 10:46:36 +0200
commit8b483f38190f834e6a206ed4fd80dbc84cba6f4b (patch)
tree5124ece286009d9fb34208fa92b18f4f09368402
parent33d8c7d9f4423a33b663ff8290c17c477cfd79f2 (diff)
downloadaur-8b483f38190f834e6a206ed4fd80dbc84cba6f4b.tar.gz
apply PR 1244 & 1247
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD20
3 files changed, 21 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1ced338e77c..06be08cdfe8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pinocchio
pkgdesc = Dynamic computations using Spatial Algebra
pkgver = 2.4.6
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/stack-of-tasks/pinocchio
arch = i686
arch = x86_64
@@ -17,9 +17,11 @@ pkgbase = pinocchio
optdepends = cppadcodegen
source = https://github.com/stack-of-tasks/pinocchio/releases/download/v2.4.6/pinocchio-2.4.6.tar.gz
source = https://github.com/stack-of-tasks/pinocchio/releases/download/v2.4.6/pinocchio-2.4.6.tar.gz.sig
+ source = https://github.com/stack-of-tasks/pinocchio/pull/1247.patch
validpgpkeys = A031AD35058955293D54DECEC45D22EF408328AD
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = d23ab9c6ae1649efebbf3f26d1f147d0992ea74501c037917f188bf980d8fe6b
pkgname = pinocchio
diff --git a/.gitignore b/.gitignore
index 138587381548..e61ad6e76bf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
pkg
src
pinocchio*
-1184.patch
+*.patch
diff --git a/PKGBUILD b/PKGBUILD
index cf64f374571b..f19cb95e9e20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgorg='stack-of-tasks'
pkgname=('pinocchio' 'pinocchio-docs')
pkgver=2.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Dynamic computations using Spatial Algebra"
arch=('i686' 'x86_64')
url="https://github.com/$pkgorg/$pkgname"
@@ -11,10 +11,24 @@ license=('BSD')
depends=('hpp-fcl' 'eigenpy' 'urdfdom')
optdepends=('doxygen' 'lua52' 'cppad' 'cppadcodegen')
makedepends=('cmake' 'eigen')
-source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig})
-sha256sums=('SKIP' 'SKIP')
+source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig}
+ $url/pull/1247.patch)
+sha256sums=('SKIP' 'SKIP'
+ 'd23ab9c6ae1649efebbf3f26d1f147d0992ea74501c037917f188bf980d8fe6b'
+ )
validpgpkeys=('A031AD35058955293D54DECEC45D22EF408328AD')
+prepare() {
+ cd "$pkgbase-$pkgver"
+
+ # ref https://github.com/stack-of-tasks/pinocchio/pull/1244
+ mv cmake/find-external/CppAD/Find{CppAD,cppad}.cmake
+ mv cmake/find-external/CppAD/Find{CppADCG,cppadcg}.cmake
+
+ # ref https://github.com/stack-of-tasks/pinocchio/pull/1247
+ patch -p1 -i "$srcdir/1247.patch"
+}
+
build() {
mkdir -p "$pkgbase-$pkgver/build"
cd "$pkgbase-$pkgver/build"