Skip to content
Snippets Groups Projects
Commit 6844c1a3 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/visp] Timeout: deleted

There is a newver version in robotpkg/image, and visp is also packaged in at
least ubuntu. Really no need to keep this older one.
parent d371e769
No related branches found
No related tags found
No related merge requests found
......@@ -95,7 +95,6 @@ SUBDIR+= sparkyarp-genom
SUBDIR+= track-target-genom
SUBDIR+= urbi
SUBDIR+= urg
SUBDIR+= visp
SUBDIR+= visuserv-genom
SUBDIR+= vnet-yarp
......
ViSP (ViSP states for "Visual Servoing Platform") is a modular
software that allows fast development of visual servoing applications.
Visual servoing consists in specifying a task as the regulation of a
set of visual features.
Despite all the research in this field, it seems that there is no
software environment that allows fast prototyping of visual servoing
tasks. The main reason is that it usually requires specific hardware
(the robot and specific framegrabbers). The consequence is that the
resulting applications are not portable and can be merely adapted to
other environments. Today's software design allows us to propose
elementary components that can be combined to build portable
high-level applications.
Various issues have thus to be considered in the design of such
applications: among these issues we find the control of robots
motions, the modeling of the visual features, and the tracking of the
visual measurements. Our environment features a wide class of control
skills as well as a library of real-time tracking processes and a
simulation toolkit.
The platform (in fact a library) is implemented in C++ and is
available under Linux, Windows and OSX. We are still in the process of
developing ViSP and are happy to entertain suggestions, have people
test code, etc. You can contact ViSP authors using visp@irisa.fr.
ViSP is developped and maintained by the INRIA Lagadic team located at
INRIA Rennes.
#
# Copyright (c) 2010 LAAS/CNRS
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for any purpose
# with or without fee is hereby granted, provided that the above copyright
# notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Thomas Moulard on Thu Feb 4 2010
#
#########################################################################
# WARNING: This version has been released by me. #
# from the ViSP subversion repository. #
# This is required as extremely important changes regarding the #
# tracker has been done and we need them. #
# Hopefully, a release will be done soon and we will be able to #
# install regular Lagadic-made release. #
# #
# -- Thomas Moulard #
# #
#########################################################################
DISTNAME= visp-${PKGVERSION}
PKGVERSION= 2.4.4-svn-20100810
CATEGORIES= image devel
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=}
MAINTAINER= openrobots@laas.fr
HOMEPAGE= http://www.irisa.fr/lagadic/visp/
COMMENT= The Visual Servoing Platform
LICENSE= qpl
WRKSRC= ${WRKDIR}/ViSP
EG_DIR= share/examples/visp
INSTALLATION_DIRS+= ${EG_DIR}
# Configuration flags.
# See http://www.irisa.fr/lagadic/visp/librarieslist.html for details.
#
# Build shared libraries, enforce backward compatibility, don't build code
# coverage tests and enforce examples building
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
CMAKE_ARGS+= -DBUILD_DEPRECATED=ON
CMAKE_ARGS+= -DBUILD_TESTING=OFF
CMAKE_ARGS+= -DBUILD_EXAMPLES=ON
# Never use deprecated libdc1394-1
CMAKE_ARGS+= -DUSE_DC1394_1=OFF
# Compilation with ffmpeg fails
CMAKE_ARGS+= -DUSE_FFMPEG=OFF
# User configurable options.
#
PKG_SUPPORTED_OPTIONS+= coin gsl gtk dc1394 jpeg opencv plotutils png v4l xml
PKG_SUGGESTED_OPTIONS+= jpeg png xml plotutils
PKG_OPTION_DESCR.dc1394?= Enable image acquisition via libdc1394
PKG_OPTION_UNSET.dc1394:= CMAKE_ARGS+=-DUSE_DC1394_2=OFF
define PKG_OPTION_SET.dc1394
CMAKE_ARGS+=-DUSE_DC1394_2=ON
include ../../image/libdc1394/depend.mk
endef
PKG_OPTION_DESCR.v4l?= Enable image acquisition via Video For Linux 2
PKG_OPTION_UNSET.v4l:= CMAKE_ARGS+=-DUSE_V4L2=OFF
define PKG_OPTION_SET.v4l
CMAKE_ARGS+=-DUSE_V4L2=ON
endef
PKG_OPTION_DESCR.opencv?= Enable the OpenCV interface
PKG_OPTION_UNSET.opencv:= CMAKE_ARGS+=-DUSE_OPENCV=OFF
define PKG_OPTION_SET.opencv
CMAKE_ARGS+=-DUSE_OPENCV=ON
CMAKE_ARGS+=-DOpenCV_ROOT_DIR=${PREFIX.opencv}
include ../../image/opencv/depend.mk
endef
PKG_OPTION_DESCR.coin?= Enable use of the Coin simulator
PKG_OPTION_UNSET.coin:= CMAKE_ARGS+=-DUSE_COIN_SIMULATOR=OFF
define PKG_OPTION_SET.coin
CMAKE_ARGS+=-DUSE_COIN_SIMULATOR=ON
include ../../mk/sysdep/coin2.mk
include ../../mk/sysdep/libsoqt.mk
endef
PKG_OPTION_DESCR.gsl?= Use gsl library for SVD and LU decomposition
PKG_OPTION_UNSET.gsl:= CMAKE_ARGS+=-DUSE_GSL=OFF
define PKG_OPTION_SET.gsl
CMAKE_ARGS+=-DUSE_GSL=ON
include ../../mk/sysdep/gsl.mk
endef
PKG_OPTION_DESCR.xml?= Enable XML-based camera calibration file format
PKG_OPTION_UNSET.xml:= CMAKE_ARGS+=-DUSE_XML2=OFF
define PKG_OPTION_SET.xml
CMAKE_ARGS+=-DUSE_XML2=ON
include ../../mk/sysdep/libxml2.mk
endef
PKG_OPTION_DESCR.gtk?= Enable gtk-based display
PKG_OPTION_UNSET.gtk:= CMAKE_ARGS+=-DUSE_GTK2=OFF
define PKG_OPTION_SET.gtk
CMAKE_ARGS+=-DUSE_GTK2=ON
include ../../mk/sysdep/gtk.mk
endef
PKG_OPTION_DESCR.jpeg?= Enable jpeg image format
PKG_OPTION_UNSET.jpeg:= CMAKE_ARGS+=-DUSE_LIBJPEG=OFF
define PKG_OPTION_SET.jpeg
CMAKE_ARGS+=-DUSE_LIBJPEG=ON
include ../../mk/sysdep/libjpeg.mk
endef
PKG_OPTION_DESCR.png?= Enable png image format
PKG_OPTION_UNSET.png:= CMAKE_ARGS+=-DUSE_LIBPNG=OFF
define PKG_OPTION_SET.png
CMAKE_ARGS+=-DUSE_LIBPNG=ON
include ../../mk/sysdep/libpng.mk
endef
# libplotter is provided by plotutils package.
PKG_OPTION_DESCR.plotutils?= Enable plotting via plotutils
PKG_OPTION_UNSET.plotutils:= CMAKE_ARGS+=-DUSE_LIBPLOTTER=OFF
define PKG_OPTION_SET.plotutils
CMAKE_ARGS+=-DUSE_LIBPLOTTER=ON
include ../../mk/sysdep/plotutils.mk
endef
include ../../archivers/zlib/depend.mk
include ../../archivers/pax/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
include ../../mk/language/c++.mk
include ../../mk/robotpkg.mk
# Install examples
#
post-install: visp-install-examples
.PHONY: visp-install-examples
visp-install-examples:
@${STEP_MSG} "Installing example files"
${RUN}cd ${WRKSRC} && cd example && \
${FIND} . -name "*cpp" | while read f; do \
${TEST} -x $${f%.cpp} && ${ECHO} $${f%.cpp}; \
${ECHO} $$f; \
done | ${PAX} -rw -pm ${PREFIX}/${EG_DIR}
This diff is collapsed.
##
# Copyright (c) 2010 LAAS/CNRS
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for any purpose
# with or without fee is hereby granted, provided that the above copyright
# notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Thomas Moulard on Thu Feb 4 2010
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
VISP_DEPEND_MK:= ${VISP_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= visp
endif
ifeq (+,$(VISP_DEPEND_MK)) # -----------------------------------------------
PREFER.visp?= robotpkg
DEPEND_USE+= visp
DEPEND_ABI.visp?= visp>=2.4.4
DEPEND_DIR.visp?= ../../image/visp
SYSTEM_SEARCH.visp=\
'bin/visp-config:p:% --dumpversion' \
'include/visp/vpConfig.h' \
'lib/libvisp-2.{a,so,dylib}'
endif # VISP_DEPEND_MK -----------------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
SHA1 (visp-2.4.4-svn-20100810.tar.gz) = 0e424bf1bd6c5fe6ea376b6f6c09337634091cfd
RMD160 (visp-2.4.4-svn-20100810.tar.gz) = 1025c071a36b09ac261b4aaeda019fb9d824bb72
Size (visp-2.4.4-svn-20100810.tar.gz) = 1188625 bytes
SHA1 (patch-a) = 0008fac5bc45106a88f9dadd1a579fe2150c035e
SHA1 (patch-b) = ebc1d4deed6784603e886dcb95971cac5968bbaa
SHA1 (patch-d) = 43433d7e4b52929a57454284fe3002c973cf8d9a
SHA1 (patch-e) = 507ea43888eeaba7ceddfd068240d2b85ba6c2c9
--- CMakeLists.txt~ 2010-08-10 21:50:18.000000000 +0900
+++ CMakeLists.txt 2010-08-10 21:50:50.000000000 +0900
@@ -1422,7 +1422,7 @@
${LIBRARY_OUTPUT_PATH}/VISPConfig.cmake
${LIBRARY_OUTPUT_PATH}/VISPBuildSettings.cmake
${LIBRARY_OUTPUT_PATH}/VISPLibraryDepends.cmake
- DESTINATION lib
+ DESTINATION share/cmake
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
)
--- CMakeModules/VISPConfig.cmake.in~ 2010-08-11 11:58:57.000000000 +0900
+++ CMakeModules/VISPConfig.cmake.in 2010-08-11 12:00:10.000000000 +0900
@@ -59,7 +59,7 @@
SET(VISP_LIBRARY "@VISP_INTERN_LIBS@")
# Set VISP_ROOT_DIR
-FIND_PATH(VISP_ROOT_DIR lib/VISPConfig.cmake
+FIND_PATH(VISP_ROOT_DIR share/cmake/VISPConfig.cmake
"${VISP_DIR}/.."
)
IF(NOT VISP_ROOT_DIR)
@@ -104,10 +104,10 @@
#MESSAGE("VISP_LIBRARY_DIRS: ${VISP_LIBRARY_DIRS}")
# Tells the user project where to find ViSP build settings
-SET(VISP_BUILD_SETTINGS_FILE "${VISP_ROOT_DIR}/lib/VISPBuildSettings.cmake")
+SET(VISP_BUILD_SETTINGS_FILE "${VISP_ROOT_DIR}/share/cmake/VISPBuildSettings.cmake")
# Tell the user project where to find ViSP dependencies
-INCLUDE("${VISP_ROOT_DIR}/lib/VISPLibraryDepends.cmake")
+INCLUDE("${VISP_ROOT_DIR}/share/cmake/VISPLibraryDepends.cmake")
# export source dir for doxygen eventually
SET(VISP_SOURCE_DIR "@VISP_SOURCE_DIR@")
@@ -123,7 +123,7 @@
#MESSAGE("VISP_LIBRARIES: ${VISP_LIBRARIES}")
# where to find the USE file to be used by user project
-SET(VISP_USE_FILE "${VISP_ROOT_DIR}/lib/VISPUse.cmake")
+SET(VISP_USE_FILE "${VISP_ROOT_DIR}/share/cmake/VISPUse.cmake")
IF(BUILD_TEST_COVERAGE)
# Add build options for test coverage. Currently coverage is only supported
--- ./include/vpConfig.h.cmake~ 2010-08-12 13:21:15.000000000 +0900
+++ ./include/vpConfig.h.cmake 2010-08-12 13:21:39.000000000 +0900
@@ -216,7 +216,7 @@
// Add the material to produce a warning when deprecated functions are used
#ifndef vp_deprecated
-# if defined (UNIX)
+# ifndef WIN32
# define vp_deprecated __attribute__((deprecated))
# else
# define vp_deprecated __declspec(deprecated)
--- src/tracking/mbt/vpMbtTracker.h~ 2010-08-13 19:27:24.000000000 +0900
+++ src/tracking/mbt/vpMbtTracker.h 2010-08-13 19:27:14.000000000 +0900
@@ -127,7 +127,7 @@
\param cMo : the vpHomogeneousMatrix used to store the pose.
*/
inline void getPose(vpHomogeneousMatrix &cMo) const {cMo = this->cMo;}
-
+ inline void setPose(const vpHomogeneousMatrix &cMo) {this->cMo = cMo;}
/*!
Get the camera paramters.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment