[wip/mhp-genom] Switch to MHP 2.2 + patch to fix MOVE3D variable overriding

mhp-genom/Makefile

@@ -2,7 +2,7 @@
 # Created:			Severin Lemaignan on Tue, 31 Aug 2010
 #
 
-DISTNAME=		mhp-genom-2.1
+DISTNAME=		mhp-genom-2.2
 CATEGORIES=		path
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=mhp-genom/}
 MASTER_REPOSITORY=	git ssh://softs/git/robots/mhp-genom
@@ -16,30 +16,48 @@ LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES+=		c c++
 
+#####################
+#### MHP OPTIONS ####
+#####################
+
 PKG_OPTIONS_REQUIRED_GROUPS=	robot
 PKG_OPTIONS_GROUP.robot=	hrp2 jido simulation
 
+##
+## HRP2
+##
 PKG_OPTION_DESCR.hrp2=	Compile MHP for HRP2
-PKG_OPTION_SET.hrp2:=	GENOM_ARGS+= -DHRP2
 
 define PKG_OPTION_SET.hrp2
+  GENOM_ARGS+= -DHRP2
   include ../../localization/pom-genom/depend.mk
   include ../../image/viman-genom/depend.mk
 endef
 
+##
+## Jido
+##
 PKG_OPTION_DESCR.jido=	Compile MHP for Jido
-PKG_OPTION_SET.jido:=	GENOM_ARGS+= -DJIDO
 
 define PKG_OPTION_SET.jido
+  GENOM_ARGS+= -DJIDO
   include ../../localization/pom-genom/depend.mk
+  include ../../math/gbM/depend.mk
+  #include ../../manipulation/lwr-genom/depend.mk
   include ../../image/viman-genom/depend.mk
 endef
 
+##
+## Simulation
+##
 PKG_OPTION_DESCR.simulation=	Compile MHP for simulation only
 PKG_OPTION_SET.simulation:=	GENOM_ARGS+= -DSIMULATION
 
-PKG_SUGGESTED_OPTIONS+=	simulation
+PKG_SUGGESTED_OPTIONS+=	jido
 
+##
+## Ontology server
+##
 PKG_SUPPORTED_OPTIONS+=	oro
 PKG_SUGGESTED_OPTIONS+=	oro
 PKG_OPTION_DESCR.oro=	Enable the support of ORO ontology server
@@ -49,8 +67,20 @@ define PKG_OPTION_SET.oro
   include ../../knowledge/liboro/depend.mk
 endef
 
+#####################
+
 GENOM_MODULE=		mhp
 
+## BioMove3D dependency
+## Build BioMove3D with the "Jido" profile to get all required options for
+# 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/BioMove3D/depend.mk
+
 include ../../architecture/genom/depend.mk
 
 include ../../mk/robotpkg.mk

mhp-genom/depend.mk

@@ -32,7 +32,7 @@ SYSTEM_SEARCH.mhp-genom=\
 
 DEPEND_USE+=		mhp-genom
 
-DEPEND_ABI.mhp-genom?=mhp-genom>=2.1
+DEPEND_ABI.mhp-genom?=mhp-genom>=2.2
 DEPEND_DIR.mhp-genom?=../../wip/mhp-genom
 
 #include ../../wip/??

mhp-genom/distinfo

-SHA1 (mhp-genom-2.1.tar.gz) = 5c58e11a85655a7bb21025a20cbb8a486e36b5c7
-RMD160 (mhp-genom-2.1.tar.gz) = 2b50c712313c43563547e4ee068cb8a0e7c71b55
-Size (mhp-genom-2.1.tar.gz) = 53179 bytes
+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

mhp-genom/patches/patch-aa

+--- 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
+