From 278739173a646a4ef4023f08716985fc70feae81 Mon Sep 17 00:00:00 2001 From: Mamoun Gharbi <mamoun.gharbi@laas.fr> Date: Fri, 11 Jan 2013 16:28:13 +0100 Subject: [PATCH] [wip/spark-genom] bump to verion 3.7 - bugfix: cleaning logs, segfault and conf print - removing a patch --- spark-genom/Makefile | 3 +-- spark-genom/depend.mk | 2 +- spark-genom/distinfo | 7 +++---- spark-genom/patches/patch-aa | 29 ----------------------------- 4 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 spark-genom/patches/patch-aa diff --git a/spark-genom/Makefile b/spark-genom/Makefile index 94c7f9f3..5db73b2d 100644 --- a/spark-genom/Makefile +++ b/spark-genom/Makefile @@ -1,8 +1,7 @@ # Created: Severin Lemaignan on Fri, 24 Sep 2010 # -DISTNAME= spark-genom-3.6 -PKGREVISION= 2 +DISTNAME= spark-genom-3.7 CATEGORIES= knowledge MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=spark-genom/} MASTER_REPOSITORY= git ssh://git.openrobots.org/git/robots/spark-genom.git diff --git a/spark-genom/depend.mk b/spark-genom/depend.mk index b0321432..be7df6c1 100644 --- a/spark-genom/depend.mk +++ b/spark-genom/depend.mk @@ -19,7 +19,7 @@ SYSTEM_SEARCH.spark-genom=\ DEPEND_USE+= spark-genom -DEPEND_ABI.spark-genom?=spark-genom>=3.6 +DEPEND_ABI.spark-genom?=spark-genom>=3.7 DEPEND_DIR.spark-genom?=../../wip/spark-genom endif # SPARK-GENOM_DEPEND_MK ---------------------------------------- diff --git a/spark-genom/distinfo b/spark-genom/distinfo index bb1665db..82580385 100644 --- a/spark-genom/distinfo +++ b/spark-genom/distinfo @@ -1,5 +1,4 @@ -SHA1 (spark-genom-3.6.tar.gz) = 591d0edea7b7bfc0f52420eeebab3d7523aef45f -RMD160 (spark-genom-3.6.tar.gz) = b564c2a6b540e02a9b5bbbeaa00b480e12c6db33 -Size (spark-genom-3.6.tar.gz) = 78147 bytes -SHA1 (patch-aa) = 9b943e155bb1f0aa34891594eb8619d4feb837e8 +SHA1 (spark-genom-3.7.tar.gz) = b39f97d2b57d1f53a75e187862c2195057adbb9a +RMD160 (spark-genom-3.7.tar.gz) = 756a259970263298bb3bc18c0d95086a479b0493 +Size (spark-genom-3.7.tar.gz) = 78226 bytes SHA1 (patch-ab) = 7fdd343d6544cb402daf0d2c3126c1157aeafb00 diff --git a/spark-genom/patches/patch-aa b/spark-genom/patches/patch-aa deleted file mode 100644 index 6c85b7f3..00000000 --- a/spark-genom/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -From 89af67c4587d408ae393d9a47e27714351d10183 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Thu, 6 Dec 2012 11:06:33 +0100 -Subject: [PATCH] Add -lglut to EXTRA_LIBS if USE_GLUT was specified. - -Required by newer bintutils. -XXX this still won't find glut if installed in a non-standard location. ---- - codels/Makefile.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git codels/Makefile.in codels/Makefile.in -index 6cf5c47..26970f4 100644 ---- codels/Makefile.in -+++ codels/Makefile.in -@@ -35,6 +35,10 @@ EXTRA_INCLUDES += -I${HOME}/openrobots/include/ni - # Add extra link flags (external libraries, ...) - #EXTRA_LIBS += @GBM_LIBS@ -lgenom @POM_EULER_LIBS@ @BIOMOVE3D_LIBS@ - -+ifneq ($(findstring USE_GLUT,${GENOM_DEFINES}),) -+EXTRA_LIBS += -lglut -+endif -+ - # - # Install files here (any header that is not included in the .gen for instance) - # Files that are included in the GenoM file are automatically installed --- -1.7.9.5 - -- GitLab