From 09dc3a83a53220bb16160fe5d33ef4795fbd4d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@laas.fr> Date: Fri, 24 Sep 2010 18:27:58 +0200 Subject: [PATCH] [wip/mhp-genom] Bumped to 2.5.1 NOthing major, mostly bug fixes + solving compilation issues with Move3D --- mhp-genom/Makefile | 5 +---- mhp-genom/depend.mk | 2 +- mhp-genom/distinfo | 7 +++---- mhp-genom/patches/patch-aa | 11 ----------- 4 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 mhp-genom/patches/patch-aa diff --git a/mhp-genom/Makefile b/mhp-genom/Makefile index 0ba21fd9..67bda867 100644 --- a/mhp-genom/Makefile +++ b/mhp-genom/Makefile @@ -2,7 +2,7 @@ # Created: Severin Lemaignan on Tue, 31 Aug 2010 # -DISTNAME= mhp-genom-2.2 +DISTNAME= mhp-genom-2.5.1 CATEGORIES= path MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/} MASTER_REPOSITORY= git ssh://softs/git/robots/mhp-genom @@ -78,9 +78,6 @@ GENOM_MODULE= mhp # HRI with BioMove3D REQD_BUILD_OPTIONS.BioMove3D:= jido -#Hack to set the Move3D path for mhp-genom/codels/Makefile -MAKE_ENV+= MOVE3D=${PREFIX.BioMove3D}/include/BioMove3D - include ../../wip/sysdep/xforms.mk include ../../wip/BioMove3D/depend.mk diff --git a/mhp-genom/depend.mk b/mhp-genom/depend.mk index b67536de..34781759 100644 --- a/mhp-genom/depend.mk +++ b/mhp-genom/depend.mk @@ -33,7 +33,7 @@ SYSTEM_SEARCH.mhp-genom=\ DEPEND_USE+= mhp-genom -DEPEND_ABI.mhp-genom?=mhp-genom>=2.2 +DEPEND_ABI.mhp-genom?=mhp-genom>=2.5.1 DEPEND_DIR.mhp-genom?=../../wip/mhp-genom #include ../../wip/?? diff --git a/mhp-genom/distinfo b/mhp-genom/distinfo index a80f8237..483d44db 100644 --- a/mhp-genom/distinfo +++ b/mhp-genom/distinfo @@ -1,4 +1,3 @@ -SHA1 (mhp-genom-2.2.tar.gz) = af165f42d80937daf4bca3f8d1ebc015d425f9cf -RMD160 (mhp-genom-2.2.tar.gz) = 390886343340095000a38b7685174ec59607aadb -Size (mhp-genom-2.2.tar.gz) = 53325 bytes -SHA1 (patch-aa) = 4faefa87e2aa9fbd5d2d1b980886b9d68db88e9c +SHA1 (mhp-genom-2.5.1.tar.gz) = 88aed0e5ba95ce1c0ab070deeb1aa975d00f2f29 +RMD160 (mhp-genom-2.5.1.tar.gz) = 1a8c1a43f105f856c60991c71cc2b1d8d9b0320a +Size (mhp-genom-2.5.1.tar.gz) = 53702 bytes diff --git a/mhp-genom/patches/patch-aa b/mhp-genom/patches/patch-aa deleted file mode 100644 index 219813dc..00000000 --- a/mhp-genom/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- codels/Makefile.in.orig 2010-08-23 17:49:14.000000000 +0200 -+++ codels/Makefile.in 2010-09-02 14:04:22.171742000 +0200 -@@ -12,7 +12,7 @@ - INSTALL= @INSTALL@ - - #--- custom path ---- --MOVE3D = /usr/local/openrobots/include/BioMove3D -+MOVE3D?= /usr/local/openrobots/include/BioMove3D - #--------------------- - include $(MOVE3D)/move3DFlags - -- GitLab