diff --git a/move3d-studio/Makefile b/move3d-studio/Makefile index 81a6cdacdad5039bed9575a36814d3155bd5ce10..3b58c83428aae2c3f6b8611c6c0130261e729d1f 100644 --- a/move3d-studio/Makefile +++ b/move3d-studio/Makefile @@ -4,10 +4,10 @@ PKGNAME= move3d-studio-${VERSION} DISTNAME= move3d-studio-${VERSION} -VERSION= 3.9.1 +VERSION= 1.2 CATEGORIES= path -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=BioMove3D/} +MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=move3d-studio/} MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/move3d-studio.git MAINTAINER= biomove3dgitrepo@laas.fr @@ -19,6 +19,7 @@ LICENSE= gnu-gpl-v2 CMAKE_ARGS+= -DGENERATE_STUDIO=ON +CMAKE_ARGS+= -DMOVE3D_QT=ON ## Dependencies include ../../math/gbM/depend.mk @@ -34,13 +35,15 @@ include ../../wip/sysdep/gts.mk include ../../wip/sysdep/qhull.mk include ../../wip/sysdep/libxpm.mk include ../../wip/sysdep/xforms.mk +include ../../wip/sysdep/qwt.mk include ../../wip/libmove3d/depend.mk - -# XXX: no such package -# include ../../wip/libhri/depend.mk +include ../../wip/libmove3d-hri/depend.mk +include ../../wip/libmove3d-planners/depend.mk include ../../mk/sysdep/cmake.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk + +include ../../pkgtools/pkg-config/depend.mk diff --git a/move3d-studio/depend.mk b/move3d-studio/depend.mk index d886b1b5538a1e2e882d58f9dd090bf630ef0cc6..3e8f0784cb6f39abe882ce412f3062e801d85eb8 100644 --- a/move3d-studio/depend.mk +++ b/move3d-studio/depend.mk @@ -19,7 +19,7 @@ SYSTEM_SEARCH.move3d-studio=\ DEPEND_USE+= move3d-studio -DEPEND_ABI.move3d-studio?=move3d-studio>=3.9 +DEPEND_ABI.move3d-studio?=move3d-studio>=1.2 DEPEND_DIR.move3d-studio?=../../wip/move3d-studio endif # MOVE3DSTUDIO_DEPEND_MK ---------------------------------------- diff --git a/move3d-studio/distinfo b/move3d-studio/distinfo index 2fb7c37fd77ac4ae844858e62143587c0c6470a2..71792fffe696080abf54ea961f8187f2dfafc825 100644 --- a/move3d-studio/distinfo +++ b/move3d-studio/distinfo @@ -1,3 +1,3 @@ -SHA1 (libmove3d-3.9.1.tar.gz) = 9f41852677184f86b5c476ea64dbd34d0200a606 -RMD160 (libmove3d-3.9.1.tar.gz) = 646347f56ae155c53d581968d5cde976e7ddf0e1 -Size (libmove3d-3.9.1.tar.gz) = 5405692 bytes +SHA1 (move3d-studio-1.2.tar.gz) = 0aa174b40fe2d18592f72b66a4f715883d8b9b5f +RMD160 (move3d-studio-1.2.tar.gz) = bd79a88e212019b2b6597096c2ce5b5a5d2712c6 +Size (move3d-studio-1.2.tar.gz) = 1313701 bytes