diff options
| author | Benjamin Chrétien | 2014-06-19 13:57:38 +0200 |
|---|---|---|
| committer | Benjamin Chrétien | 2014-06-19 13:57:38 +0200 |
| commit | 294fcde44b1a3bfb97d4212ee4cb55a0100ff3d9 (patch) | |
| tree | 56748b304f543c2ee6d6bab1209524de0aa0b69c | |
| parent | 4324c84284a5e2faa16cf1c546260ba3aaac0d7d (diff) | |
| download | aur-294fcde44b1a3bfb97d4212ee4cb55a0100ff3d9.tar.gz | |
libdart, fcl, ccd updates.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rwxr-xr-x | PKGBUILD | 4 | ||||
| -rw-r--r-- | ipopt.patch | 13 |
3 files changed, 9 insertions, 12 deletions
@@ -5,7 +5,7 @@ pkgbase = libdart url = http://dartsim.github.io arch = i686 arch = x86_64 - license = (L)GPL2 + license = BSD makedepends = cmake makedepends = doxygen depends = assimp @@ -22,7 +22,7 @@ pkgbase = libdart source = https://github.com/dartsim/dart/archive/v4.0.tar.gz source = ipopt.patch md5sums = 41547fc96f5f2c85ee3672ddb2ec7376 - md5sums = 9a497cceb18ecd8b83fe56af477c4096 + md5sums = e6f7d4c4b26c7dc0751266a8a611325f pkgname = libdart @@ -5,7 +5,7 @@ pkgrel=1 pkgdesc="Dynamic Animation and Robotics Toolkit" arch=('i686' 'x86_64') url="http://dartsim.github.io" -license=('(L)GPL2') +license=('BSD') depends=('assimp' 'boost' 'eigen>=3' 'fcl' 'flann' 'glut' 'libccd' 'libgl') optdepends=('bullet: Bullet support' 'ipopt: Ipopt support' @@ -15,7 +15,7 @@ _name=dart source=(https://github.com/dartsim/${_name}/archive/v${pkgver}.tar.gz "ipopt.patch") md5sums=('41547fc96f5f2c85ee3672ddb2ec7376' - '9a497cceb18ecd8b83fe56af477c4096') + 'e6f7d4c4b26c7dc0751266a8a611325f') # Build type _buildtype="Release" diff --git a/ipopt.patch b/ipopt.patch index f6d93eb2fbeb..3c924ad3576f 100644 --- a/ipopt.patch +++ b/ipopt.patch @@ -1,4 +1,4 @@ -commit 0a1a79a5b49d0c2619b80f8a2a9856405a60f5f8 +commit 12e6127821515e0dec956a7e288fdc205787f97e Author: Benjamin Chrétien <chretien@lirmm.fr> Date: Thu Jun 19 12:55:53 2014 +0200 @@ -9,16 +9,13 @@ Date: Thu Jun 19 12:55:53 2014 +0200 Lapack, etc.). diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake -index ebfebd3..3e4bf48 100644 +index ebfebd3..766fa4f 100644 --- a/cmake/FindIPOPT.cmake +++ b/cmake/FindIPOPT.cmake -@@ -14,10 +14,7 @@ find_path(IPOPT_INCLUDE_DIR IpIpoptNLP.hpp - HINTS ${PC_IPOPT_INCLUDEDIR} ${PC_IPOPT_INCLUDE_DIRS} - PATHS "${CMAKE_INSTALL_PREFIX}/include") +@@ -17,7 +17,7 @@ find_path(IPOPT_INCLUDE_DIR IpIpoptNLP.hpp + find_library(IPOPT_LIBRARY NAMES ipopt + HINTS ${PC_IPOPT_LIBDIR} ${PC_IPOPT_LIBRARY_DIRS} ) --find_library(IPOPT_LIBRARY NAMES ipopt -- HINTS ${PC_IPOPT_LIBDIR} ${PC_IPOPT_LIBRARY_DIRS} ) -- -set(IPOPT_LIBRARIES ${IPOPT_LIBRARY}) +set(IPOPT_LIBRARIES ${PC_IPOPT_LIBRARIES}) set(IPOPT_INCLUDE_DIRS ${IPOPT_INCLUDE_DIR}) |