v1.2.0

3 files changed, 7 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb5ce011f84a..c96a2123621d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = crocoddyl
 	pkgdesc = optimal control library for robot control under contact sequence
-	pkgver = 1.1.0
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/loco-3d/crocoddyl
 	arch = i686
@@ -12,15 +12,12 @@ pkgbase = crocoddyl
 	depends = eigenpy
 	depends = example-robot-data
 	optdepends = doxygen
-	optdepends = multicontact-api
 	optdepends = python-scipy
-	source = https://github.com/loco-3d/crocoddyl/releases/download/v1.1.0/crocoddyl-1.1.0.tar.gz
-	source = https://github.com/loco-3d/crocoddyl/releases/download/v1.1.0/crocoddyl-1.1.0.tar.gz.sig
-	source = fix-link.patch
+	source = https://github.com/loco-3d/crocoddyl/releases/download/v1.2.0/crocoddyl-1.2.0.tar.gz
+	source = https://github.com/loco-3d/crocoddyl/releases/download/v1.2.0/crocoddyl-1.2.0.tar.gz.sig
 	validpgpkeys = 9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 283176ddd836f6b2b4784cec4c3b8c2ab89d01094be2d417e72ccad092bf81aa
 
 pkgname = crocoddyl
 
diff --git a/PKGBUILD b/PKGBUILD
index d7415c7a26ef..0a7f1d6cc646 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,19 @@
 
 pkgorg='loco-3d'
 pkgname=('crocoddyl' 'crocoddyl-docs')
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="optimal control library for robot control under contact sequence"
 arch=('i686' 'x86_64')
 url="https://github.com/$pkgorg/$pkgname"
 license=('BSD')
 depends=('pinocchio' 'eigenpy' 'example-robot-data')
-optdepends=('doxygen' 'multicontact-api' 'python-scipy')
+optdepends=('doxygen' 'python-scipy')
 makedepends=('cmake' 'eigen')
-source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig} fix-link.patch)
-sha256sums=('SKIP' 'SKIP' '283176ddd836f6b2b4784cec4c3b8c2ab89d01094be2d417e72ccad092bf81aa')
+source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig})
+sha256sums=('SKIP' 'SKIP')
 validpgpkeys=('9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28')
 
-prepare() {
-    # patch missing links
-    cd "$pkgbase-$pkgver"
-    patch -p1 -i $srcdir/fix-link.patch
-}
-
 build() {
     mkdir -p "$pkgbase-$pkgver/build"
     cd "$pkgbase-$pkgver/build"
diff --git a/fix-link.patch b/fix-link.patch
deleted file mode 100644
index 92e8b83aeb1e..000000000000
--- a/fix-link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cc7c6ac5400bac438bdd12c54dcedb503446fde6 Mon Sep 17 00:00:00 2001
-From: Guilhem Saurel <guilhem.saurel@laas.fr>
-Date: Wed, 26 Feb 2020 17:18:52 +0100
-Subject: [PATCH] fix-link
-
----
- benchmark/CMakeLists.txt | 1 +
- unittest/CMakeLists.txt  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
-index 0e5160e3..e1a0b2eb 100644
---- a/benchmark/CMakeLists.txt
-+++ b/benchmark/CMakeLists.txt
-@@ -15,6 +15,7 @@ FOREACH(BENCHMARK_NAME ${${PROJECT_NAME}_BENCHMARK})
-   PKG_CONFIG_USE_DEPENDENCY(${BENCHMARK_NAME} pinocchio)
-   PKG_CONFIG_USE_DEPENDENCY(${BENCHMARK_NAME} example-robot-data)
-   TARGET_LINK_LIBRARIES(${BENCHMARK_NAME} ${PROJECT_NAME})
-+  TARGET_LINK_LIBRARIES(${BENCHMARK_NAME} ${PYTHON_LIBRARIES})
- ENDFOREACH(BENCHMARK_NAME ${${PROJECT_NAME}_BENCHMARK})
- 
- FOREACH(BENCHMARK_NAME ${${PROJECT_NAME}_BENCHMARK})
-diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
-index ef2c298d..6b5ce795 100644
---- a/unittest/CMakeLists.txt
-+++ b/unittest/CMakeLists.txt
-@@ -52,6 +52,7 @@ MACRO(ADD_CPP_UNIT_TEST NAME PKGS)
- 
-   TARGET_LINK_LIBRARIES(${unittest_name} ${PROJECT_NAME})
-   TARGET_LINK_LIBRARIES(${unittest_name} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-+  TARGET_LINK_LIBRARIES(${unittest_name} ${PYTHON_LIBRARIES})
- 
-   ADD_TEST_CFLAGS(${unittest_name} '-DCROCODDYL_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"')
- ENDMACRO(ADD_CPP_UNIT_TEST NAME PKGS)
--- 
-2.25.1
-