Merge branch 'master' of ssh://git.openrobots.org/robots/robotpkg/robotpkg-wip

genom3-openprs/Makefile

@@ -2,7 +2,7 @@
 # Created:			Anthony Mallet on Sun, 28 Jan 2007
 #
 
-PKGREVISION=	1
+PKGREVISION=	2
 DISTNAME=	genom3-openprs-1.0.6
 CATEGORIES=	architecture
 MASTER_SITES=	${MASTER_SITE_OPENROBOTS:=genom3-openprs/}
@@ -17,6 +17,9 @@ LICENSE=	2-clause-bsd
 GNU_CONFIGURE=	yes
 NOT_FOR_PLATFORM=	# empty
 
+# for checkout target
+AUTORECONF_SCRIPT=	${SH}
+AUTORECONF_ARGS=	${WRKSRC}/bootstrap.sh
 
 include ../../wip/transgen3/depend.mk
 include ../../pkgtools/pkg-config/depend.mk

genom3-openprs/distinfo

 SHA1 (genom3-openprs-1.0.6.tar.gz) = 9d7740f3ef344817255c49491fbcde6381f948f4
 RMD160 (genom3-openprs-1.0.6.tar.gz) = 31b567ed8f2396f8cf957b4ca53efbe69fdba066
 Size (genom3-openprs-1.0.6.tar.gz) = 61419 bytes
+SHA1 (patch-aa) = b81520e5d19585be76118bf4ed06edeba393e64e

genom3-openprs/patches/patch-aa

+Private exceptions will not be defined for a client (since they cannot be
+thrown).
+
+This fixes the build of component defining exceptions thrown only by tasks.
+
+diff --git a/client/EncodeDecodeOpenprs.c b/client/EncodeDecodeOpenprs.c
+index a776c90..d99b98b 100644
+--- client/EncodeDecodeOpenprs.c
++++ client/EncodeDecodeOpenprs.c
+@@ -485,7 +485,8 @@ Term *genom_oprs_<"$comp">_exception(genom_event e, const void *detail)
+ 	  free(s);
+ 	  return res;
+      }
+-<'foreach e [$component throws] {'>
++<'foreach e [$component types public] {'>
++<'  if {[$e kind] != "exception"} continue'>
+      else if (e == <"[$e cname]">_id) {
+ <'  if {[llength [$e members]]} {'>
+        return build_<"$comp">_exception_term("<"[$e cname]">", decode_g3_<"[$e mangle]">(detail));

hatpconsole/Makefile

@@ -3,7 +3,7 @@
 #
 
 DISTNAME=		hatpconsole-${VERSION}
-VERSION=		1.1.0
+VERSION=		1.1.1
 PKGREVISION=		
 CATEGORIES=		planning
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=hatpconsole/}

hatpconsole/depend.mk

@@ -14,7 +14,7 @@ PREFER.hatpconsole?=	robotpkg
 
 DEPEND_USE+=		hatpconsole
 
-DEPEND_ABI.hatpconsole?=	hatpconsole>=1.1.0
+DEPEND_ABI.hatpconsole?=	hatpconsole>=1.1.1
 DEPEND_DIR.hatpconsole?=	../../wip/hatpconsole
 
 SYSTEM_SEARCH.hatpconsole=\

hatpconsole/distinfo

-SHA1 (hatpconsole-1.1.0.tar.gz) = cfe9d6d21b08962e3c910bf35e587dc9a225a36b
-RMD160 (hatpconsole-1.1.0.tar.gz) = c8be7e3297e1a0ecdc491d1dbfc6a7e83daf3434
-Size (hatpconsole-1.1.0.tar.gz) = 15794 bytes
+SHA1 (hatpconsole-1.1.1.tar.gz) = a532dc5900162206d8abbed3720753f5716a738b
+RMD160 (hatpconsole-1.1.1.tar.gz) = ab224ec340432939aa3630b97937fcf7441783d4
+Size (hatpconsole-1.1.1.tar.gz) = 16630 bytes

hatponboard-lib/Makefile

@@ -3,7 +3,7 @@
 #
 
 DISTNAME=		hatponboard-lib-${VERSION}
-VERSION=		2.0.0
+VERSION=		2.1.4
 PKGREVISION=		
 CATEGORIES=		planning
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=hatponboard-lib/}

hatponboard-lib/depend.mk

@@ -14,7 +14,7 @@ PREFER.hatpconsole?=	robotpkg
 
 DEPEND_USE+=		hatponboard-lib
 
-DEPEND_ABI.hatponboard-lib?=	hatponboard-lib>=2.0.0
+DEPEND_ABI.hatponboard-lib?=	hatponboard-lib>=2.1.4
 DEPEND_DIR.hatponboard-lib?=	../../wip/hatponboard-lib
 
 SYSTEM_SEARCH.hatponboard-lib=\

hatponboard-lib/distinfo

-SHA1 (hatponboard-lib-2.0.0.tar.gz) = 95ed2a57936dc49c417668d59f560469595b4951
-RMD160 (hatponboard-lib-2.0.0.tar.gz) = fa4a9b2d6fa991cb3ea30219676689d3eb62ce6d
-Size (hatponboard-lib-2.0.0.tar.gz) = 134112 bytes
+SHA1 (hatponboard-lib-2.1.4.tar.gz) = 8d07062319f48a7a415dc06d5bfee2cea944f96d
+RMD160 (hatponboard-lib-2.1.4.tar.gz) = 73849642a7d438c004fcc7f25a6948b83e8fa281
+Size (hatponboard-lib-2.1.4.tar.gz) = 135294 bytes

hatptester/Makefile

@@ -4,7 +4,7 @@
 
 DISTNAME=		hatptester-${VERSION}
 VERSION=		1.4.1
-PKGREVISION=		
+PKGREVISION=		1
 CATEGORIES=		planning
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=hatptester/}
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_OPENROBOTS}hatp/hatptester

hatptester/distinfo

 SHA1 (hatptester-1.4.1.tar.gz) = 7a6533fed88358ece49bc841ab8bcd3a064c5cdf
 RMD160 (hatptester-1.4.1.tar.gz) = 493b5f4301b188aa8a9b4d4e38e3e287a33ef05c
 Size (hatptester-1.4.1.tar.gz) = 19698 bytes
+SHA1 (patch-aa) = 20be8bb6cef5500bfbe9928ec02e7984c4d24c14

hatptester/patches/patch-aa

+From c4ce62ce08fcabc00e6e89e3e503db5fbca2241b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr>
+Date: Fri, 23 May 2014 18:16:16 +0200
+Subject: [PATCH] [CMake] Fix linker issue
+
+With the new version of Boost the System library is no longer
+automatically linked, fix this issue.
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index c32c382..6f49a83 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ set(APP_ASSOCIATED_TAG "v${APP_VERSION}") #Tag associated to the software versio
+ 
+ find_package(msgconnector REQUIRED msgconnector)
+ find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui)
+-find_package(Boost REQUIRED thread regex signals program_options)
++find_package(Boost REQUIRED thread regex signals program_options system)
+ find_package(Threads)
+ 
+ if(msgconnector_FOUND)
+-- 
+1.7.9.5
+

jafar-qdisplay/distinfo

@@ -2,3 +2,4 @@ SHA1 (jafar-qdisplay-0.2.tar.gz) = 4587d2f948f3b9142d65a0d4fd877a238911ad41
 RMD160 (jafar-qdisplay-0.2.tar.gz) = d6c93e9ef0341d4fadf7af3b64673cc3324b3900
 Size (jafar-qdisplay-0.2.tar.gz) = 135793 bytes
 SHA1 (patch-aa) = d0f3956e716eb83f10dcc3fdc10a19f355574e12
+SHA1 (patch-ab) = b1b3ea283181c67a6243b7512bcb207e88cfa3f2

jafar-qdisplay/patches/patch-ab

+Fix conflict with 3rd party signal/slot library by changing QT keywords
+
+--- include/qdisplay/ImageView.hpp	2014-05-29 02:12:04.457979610 +0200
++++ include/qdisplay/ImageView.hpp	2014-05-29 02:14:13.389975801 +0200
+@@ -77,7 +77,7 @@
+ 	/** Exports the view to different image format */
+     void exportView( const std::string& _fileName );
+ 
+-  public slots:
++  public Q_SLOTS:
+     void lutRandomize();
+     void lutGrayscale();
+     void lutInvertGrayscale();
+--- include/qdisplay/init.hpp	2014-05-29 02:12:04.457979610 +0200
++++ include/qdisplay/init.hpp	2014-05-29 02:14:13.389975801 +0200
+@@ -61,7 +61,7 @@
+ 			void (*_onExit)(SharedDataStructure*,boost::thread*) = NULL);
+ 		~QtAppStart();
+ 		
+-	public slots:
++	public Q_SLOTS:
+ 		void display();
+ 		void onExit();
+ };
+--- include/qdisplay/labeler.hpp	2014-05-29 02:12:04.457979610 +0200
++++ include/qdisplay/labeler.hpp	2014-05-29 02:14:13.389975801 +0200
+@@ -91,7 +91,7 @@
+ public:
+ 	Labeler(int nimages, char** images);
+ 	~Labeler();
+-public slots:
++public Q_SLOTS:
+ 	void onKeyPress(QKeyEvent *event);
+ 	void onMouseClick(QGraphicsSceneMouseEvent *mouseEvent, bool isClick);
+ 	void onMouseMove(QGraphicsSceneMouseEvent *mouseEvent);
+--- include/qdisplay/Viewer.hpp	2014-05-29 02:12:04.457979610 +0200
++++ include/qdisplay/Viewer.hpp	2014-05-29 02:14:13.393975801 +0200
+@@ -114,10 +114,10 @@
+      * Export the view to the given file name.
+      */
+     void exportView( const std::string& fileName );
+-  public slots:
++  public Q_SLOTS:
+ 		void exportView();
+ 		//void updateSceneRect();
+-	signals:
++	Q_SIGNALS:
+ 		void onKeyPress(QKeyEvent *event);
+ 		void onMouseClick(QGraphicsSceneMouseEvent *mouseEvent, bool isClick);
+ 		void onMouseMove(QGraphicsSceneMouseEvent *mouseEvent);
+--- include/qdisplay.i	2014-05-29 02:12:04.457979610 +0200
++++ include/qdisplay.i	2014-05-29 02:14:42.589974937 +0200
+@@ -38,8 +38,8 @@
+ %include "jafar.i"
+ %import "jmath/jblas.i"
+ 
+-#define slots
+-#define signals protected
++#define Q_SLOTS
++#define Q_SIGNALS protected
+ #define Q_OBJECT
+ 
+ %include "qdisplayException.i"
+--- src/Viewer.cpp	2014-05-29 02:12:04.461979610 +0200
++++ src/Viewer.cpp	2014-05-29 02:15:27.421973612 +0200
+@@ -265,7 +265,7 @@
+       scaleView(1 / 1.2);
+       break;
+   }
+-  emit onKeyPress(event);
++  Q_EMIT onKeyPress(event);
+ }
+ 
+ 
+@@ -273,7 +273,7 @@
+ {
+ 	QPointF dp = mouseEvent->buttonDownScreenPos(mouseEvent->button()) - mouseEvent->screenPos();
+ 	bool isClick = (std::abs(dp.x()) < 4) && (std::abs(dp.y()) < 4);
+-	emit viewer->onMouseClick(mouseEvent, isClick);
++	Q_EMIT viewer->onMouseClick(mouseEvent, isClick);
+ }
+ 
+ void Viewer::wheelEvent(QWheelEvent *event)
+@@ -417,7 +417,7 @@
+ 		qdisplay::Viewer *viewer = dynamic_cast<qdisplay::Viewer*>(*it);
+ 		if (viewer) viewer->setTitleWithMouseCoordinates(pos.x(), pos.y());
+ 	}
+-	emit viewer->onMouseMove(event);
++	Q_EMIT viewer->onMouseMove(event);
+ 	QGraphicsScene::mouseMoveEvent(event);
+ }
+ 

jafar-rtslam/distinfo

 SHA1 (jafar-rtslam-0.3.tar.gz) = de6ce87c7bfb5b4c1a613301080fea7a6c776491
 RMD160 (jafar-rtslam-0.3.tar.gz) = dd97d607e1de192218f4a9ec621af9d11ffd6de7
 Size (jafar-rtslam-0.3.tar.gz) = 768877 bytes
+SHA1 (patch-aa) = 74e4aa2badc4a225a288e5420ab9065da3f7f353

jafar-rtslam/patches/patch-aa

+--- include/rtslam/display_qt.hpp	2014-05-29 02:22:39.677960843 +0200
++++ include/rtslam/display_qt.hpp	2014-05-29 02:23:33.309959257 +0200
+@@ -153,7 +153,7 @@
+ 		void bufferize();
+ 		void render();
+ 		void dump(std::string filename);
+-	public slots:
++	public Q_SLOTS:
+ 		void onKeyPress(QKeyEvent *event);
+ 		void onMouseClick(QGraphicsSceneMouseEvent *mouseEvent, bool isClick);
+ };

msgconnector/Makefile

@@ -3,7 +3,7 @@
 #
 
 DISTNAME=		msgconnector-${VERSION}
-VERSION=		2.8.2
+VERSION=		2.8.4
 PKGREVISION=    	
 CATEGORIES=		planning
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=msgconnector/}

msgconnector/depend.mk

@@ -14,7 +14,7 @@ PREFER.msgconnector?=	robotpkg
 
 DEPEND_USE+=		msgconnector
 
-DEPEND_ABI.msgconnector?=	msgconnector>=2.8.2
+DEPEND_ABI.msgconnector?=	msgconnector>=2.8.4
 DEPEND_DIR.msgconnector?=	../../wip/msgconnector
 
 SYSTEM_SEARCH.msgconnector=\

msgconnector/distinfo

-SHA1 (msgconnector-2.8.2.tar.gz) = cdb41092fd07084d2d26c56c768fe31992ccc64d
-RMD160 (msgconnector-2.8.2.tar.gz) = a55d872f1355fb8d9d2a4ea0df84fd6fb2684e82
-Size (msgconnector-2.8.2.tar.gz) = 21441 bytes
+SHA1 (msgconnector-2.8.4.tar.gz) = db6b7ab78ba7fb3f20491457fcdaea1f2692df2f
+RMD160 (msgconnector-2.8.4.tar.gz) = 08aa874ad0ae7292dee8cddb874031f698d0bfe5
+Size (msgconnector-2.8.4.tar.gz) = 21523 bytes

vnet-yarp/Makefile

@@ -17,7 +17,7 @@ DEPEND_ABI.boost-header = 	boost-headers>=1.43
 DEPEND_ABI.boost-libs= 		boost-libs>=1.43
 
 CMAKE_ARGS+=        -DBoost_INCLUDE_DIR=${PREFIX.boost-headers}/include
-CMAKE_ARGS+=        -DBoost_LIBRARY_DIR=${PREFIX.boost-libs}/lib
+CMAKE_ARGS+=        -DBoost_LIBDIR=${PREFIX.boost-libs}/lib
 
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk