From e6300a8ba16048a525c5c07baeb5ea73154f05e2 Mon Sep 17 00:00:00 2001 From: Benjamin VADANT <bvadant@laas.fr> Date: Mon, 16 Sep 2013 18:10:10 +0200 Subject: [PATCH] [wip/libmove3d-planners] bump to version 1.3.2 Putting BGL calls in compliance with next BGL versions --- libmove3d-planners/Makefile | 7 +++++-- libmove3d-planners/depend.mk | 7 +------ libmove3d-planners/distinfo | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libmove3d-planners/Makefile b/libmove3d-planners/Makefile index 3b7140d5..f7aac169 100644 --- a/libmove3d-planners/Makefile +++ b/libmove3d-planners/Makefile @@ -2,11 +2,11 @@ # Created: Jim Mainprice on Thu, 2 Feb 2011 # -DISTNAME= libmove3d-planners-1.3.1 +DISTNAME= libmove3d-planners-1.3.2 CATEGORIES= path MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=libmove3d-planners/} MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/libmove3d-planners -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= biomove3dgitrepo@laas.fr COMMENT= C++ (object oriented) Motion planning algorithms based on libmove3d @@ -21,6 +21,9 @@ CMAKE_ARGS+= -DEigen_INCLUDE_DIR=${PREFIX.eigen2}/include/eigen2 CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include CMAKE_ARGS+= -DBOOST_LIBRARYDIR=${PREFIX.boost-libs}/lib +PREFER.boost-headers = robotpkg +PREFER.boost-libs = robotpkg + ## Common includes include ../../wip/libmove3d/depend.mk include ../../wip/libmove3d-hri/depend.mk diff --git a/libmove3d-planners/depend.mk b/libmove3d-planners/depend.mk index 276dc989..90affe1b 100644 --- a/libmove3d-planners/depend.mk +++ b/libmove3d-planners/depend.mk @@ -28,7 +28,7 @@ PREFER.libmove3d-planners?= robotpkg DEPEND_USE+= libmove3d-planners -DEPEND_ABI.libmove3d-planners?= libmove3d-planners>=1.3.1 +DEPEND_ABI.libmove3d-planners?= libmove3d-planners>=1.3.2 DEPEND_DIR.libmove3d-planners?= ../../wip/libmove3d-planners SYSTEM_SEARCH.libmove3d-planners=\ @@ -36,11 +36,6 @@ SYSTEM_SEARCH.libmove3d-planners=\ lib/libmove3d-planners.so \ lib/pkgconfig/libmove3d-planners.pc - -DEPEND_ABI.libmove3d-planners?=libmove3d-planners>=1.3.1 -DEPEND_DIR.libmove3d-planners?=../../wip/libmove3d-planners - - endif # libmove3d_planners_DEPEND_MK ---------------------------------------- DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/libmove3d-planners/distinfo b/libmove3d-planners/distinfo index b7c5c526..1cc9c650 100644 --- a/libmove3d-planners/distinfo +++ b/libmove3d-planners/distinfo @@ -1,3 +1,3 @@ -SHA1 (libmove3d-planners-1.3.1.tar.gz) = 93944f04ae005a3b9686160a1805260027b7b388 -RMD160 (libmove3d-planners-1.3.1.tar.gz) = 0a7b8da7f365d4e4668bcdb48ec267284484ab98 -Size (libmove3d-planners-1.3.1.tar.gz) = 452967 bytes +SHA1 (libmove3d-planners-1.3.2.tar.gz) = d3f0f290161f319a414be94d864a1d748c96c267 +RMD160 (libmove3d-planners-1.3.2.tar.gz) = 64514ccba794d0b106c08a90649294d9ceff6110 +Size (libmove3d-planners-1.3.2.tar.gz) = 452986 bytes -- GitLab