From 9e38d64cd658eed16c803b8bb3f86b5e4c904b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@epfl.ch>
Date: Thu, 19 Dec 2013 17:27:46 +0100
Subject: [PATCH] [wip/chilitags] Update to 1.3.1
Changes since 1.3.0:
. drop the dependency on a C compiler
Added proper dependency requirements on g++/clang++ for C++11.
---
chilitags/Makefile | 23 ++++++++++++++---------
chilitags/distinfo | 6 +++---
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/chilitags/Makefile b/chilitags/Makefile
index a4121cb8..ecef205f 100644
--- a/chilitags/Makefile
+++ b/chilitags/Makefile
@@ -2,23 +2,28 @@
# Created: Séverin Lemaignan on Fri, 13 Dec 2013
#
-VERSION= 1.3.0
+VERSION= 1.3.1
DISTNAME= chilitags-${VERSION}
-MASTER_SITES= ${MASTER_SITE_GITHUB:=chili-epfl/chilitags/archive/${VERSION}${EXTRACT_SUFX}?f=}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/chili-epfl/chilitags
+DISTBASE= chili-epfl/chilitags/archive/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=${DISTBASE}${VERSION}${EXTRACT_SUFX}?f=}
+MASTER_REPOSITORY=\
+ ${MASTER_REPOSITORY_GITHUB}/chili-epfl/chilitags
-CATEGORIES= image
-MAINTAINER= severin.lemaignan@epfl.ch
-LICENSE= gnu-lgpl-v3
-HOMEPAGE= https://github.com/chili-epfl/chilitags
-COMMENT= Robust Fiducial Markers for Augmented Reality
+CATEGORIES= image
+MAINTAINER= severin.lemaignan@epfl.ch
+LICENSE= gnu-lgpl-v3
+HOMEPAGE= https://github.com/chili-epfl/chilitags
+COMMENT= Robust Fiducial Markers for Augmented Reality
CMAKE_ARGS+= -DWITH_CREATOR=ON
CMAKE_ARGS+= -DWITH_DETECTOR=ON
CMAKE_ARGS+= -DWITH_SAMPLES=ON
+DEPEND_ABI.opencv += opencv>=2.4
+DEPEND_ABI.g++ += g++>=4.7
+DEPEND_ABI.clang++ += clang++>=3.1
+
include ../../image/opencv/depend.mk
-include ../../mk/language/c.mk
include ../../mk/language/c++.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/robotpkg.mk
diff --git a/chilitags/distinfo b/chilitags/distinfo
index e8e51504..0479cb3d 100644
--- a/chilitags/distinfo
+++ b/chilitags/distinfo
@@ -1,3 +1,3 @@
-SHA1 (chilitags-1.3.0.tar.gz) = 2c92beb9a9a6f2cad039c9eb402b7780e7190a94
-RMD160 (chilitags-1.3.0.tar.gz) = 58df2d00848036daf14d98f49ebd388f9694b0c9
-Size (chilitags-1.3.0.tar.gz) = 127448 bytes
+SHA1 (chilitags-1.3.1.tar.gz) = 50107bcbf2e31c2bbfec56973503843713afdf4d
+RMD160 (chilitags-1.3.1.tar.gz) = fbe1c4d00f28b9bf4dce026b8ee92026147dc5dd
+Size (chilitags-1.3.1.tar.gz) = 127442 bytes
--
GitLab