Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4552
Modified Files:
Tag: release-2-0-patches
acinclude.m4 configure.ac
Log Message:
backported lots of stuff from HEAD
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.80.2.3
retrieving revision 1.80.2.4
diff -C2 -d -r1.80.2.3 -r1.80.2.4
*** acinclude.m4 20 Apr 2006 00:47:58 -0000 1.80.2.3
--- acinclude.m4 7 Jun 2006 16:12:35 -0000 1.80.2.4
***************
*** 122,126 ****
["-lgsl -lgslcblas"])
! PLAYER_ADD_DRIVER([acts],[no],[],[],[])
dnl TODO: handle pkg-config location of gsl. Some, but not all,
--- 122,126 ----
["-lgsl -lgslcblas"])
! PLAYER_ADD_DRIVER([acts],[yes],[],[],[])
dnl TODO: handle pkg-config location of gsl. Some, but not all,
***************
*** 131,137 ****
PLAYER_ADD_DRIVER([amcl], [yes],[gsl/gsl_version.h],[],["-lgsl -lgslcblas"])
! PLAYER_ADD_DRIVER([amtecpowercube],[no],[],[],[])
! PLAYER_ADD_DRIVER([aodv],[no],[],[],[])
PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
--- 131,140 ----
PLAYER_ADD_DRIVER([amcl], [yes],[gsl/gsl_version.h],[],["-lgsl -lgslcblas"])
! PLAYER_ADD_DRIVER([amtecpowercube],[yes],[],[],[])
!
PLAYER_ADD_DRIVER([artoolkitplus],[yes],[],[],[],[ARTOOLKITPLUS],[artoolkitplus
>= 2.0.2])
! PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $ARTOOLKITPLUS_LIBS"
!
! PLAYER_ADD_DRIVER([aodv],[yes],[],[],[])
PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
***************
*** 168,176 ****
PLAYER_ADD_DRIVER([cameracompress],[yes],[jpeglib.h],[],[-ljpeg])
PLAYER_ADD_DRIVER([camerav4l],[yes],[linux/videodev.h],[],[])
! PLAYER_ADD_DRIVER([canonvcc4],[no],[],[],[])
! PLAYER_ADD_DRIVER([clodbuster],[no],[],[],[])
PLAYER_ADD_DRIVER([cmucam2],[yes],[],[],[])
--- 171,181 ----
PLAYER_ADD_DRIVER([cameracompress],[yes],[jpeglib.h],[],[-ljpeg])
+ PLAYER_ADD_DRIVER([camerauvc],[yes],[linux/videodev.h],[],[])
+
PLAYER_ADD_DRIVER([camerav4l],[yes],[linux/videodev.h],[],[])
! PLAYER_ADD_DRIVER([canonvcc4],[yes],[],[],[])
! PLAYER_ADD_DRIVER([clodbuster],[yes],[],[],[])
PLAYER_ADD_DRIVER([cmucam2],[yes],[],[],[])
***************
*** 178,184 ****
PLAYER_ADD_DRIVER([cmvision],[yes],[],[],[])
! PLAYER_ADD_DRIVER([dummy],[no],[],[],[])
! PLAYER_ADD_DRIVER([er1],[no],[asm/ioctls.h],[],[])
PLAYER_ADD_DRIVER([fakelocalize], [yes],[],[],[])
--- 183,189 ----
PLAYER_ADD_DRIVER([cmvision],[yes],[],[],[])
! PLAYER_ADD_DRIVER([dummy],[yes],[],[],[])
! PLAYER_ADD_DRIVER([er1],[yes],[asm/ioctls.h],[],[])
PLAYER_ADD_DRIVER([fakelocalize], [yes],[],[],[])
***************
*** 186,202 ****
PLAYER_ADD_DRIVER([festival],[yes],[],[],[])
- PLAYER_ADD_DRIVER([fixedtones],[no],[rfftw.h],[],
- ["-lrfftw -lfftw"])
-
PLAYER_ADD_DRIVER([flockofbirds],[yes],[],[],[])
PLAYER_ADD_DRIVER([garcia],[no],
[],[],[],[GARCIA],[libgarcia])
PLAYER_ADD_DRIVER([garminnmea],[yes],[],[],[])
! PLAYER_ADD_DRIVER([imageseq],[no],[],[],[],[OPENCV],[opencv])
! PLAYER_ADD_DRIVER([isense],[no],[isense/isense.h],
[],["-lisense"])
--- 191,206 ----
PLAYER_ADD_DRIVER([festival],[yes],[],[],[])
PLAYER_ADD_DRIVER([flockofbirds],[yes],[],[],[])
PLAYER_ADD_DRIVER([garcia],[no],
[],[],[],[GARCIA],[libgarcia])
+ PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $GARCIA_LIBS"
PLAYER_ADD_DRIVER([garminnmea],[yes],[],[],[])
! PLAYER_ADD_DRIVER([imageseq],[yes],[],[],[],[OPENCV],[opencv])
! PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
! PLAYER_ADD_DRIVER([isense],[yes],[isense/isense.h],
[],["-lisense"])
***************
*** 205,211 ****
PLAYER_ADD_DRIVER([khepera],[yes],[],[],[])
! PLAYER_ADD_DRIVER([laserbar],[no],[],[],[])
! PLAYER_ADD_DRIVER([laserbarcode],[no],[],[],[])
PLAYER_ADD_DRIVER([lasercspace],[yes],[],[],[])
--- 209,215 ----
PLAYER_ADD_DRIVER([khepera],[yes],[],[],[])
! PLAYER_ADD_DRIVER([laserbar],[yes],[],[],[])
! PLAYER_ADD_DRIVER([laserbarcode],[yes],[],[],[])
PLAYER_ADD_DRIVER([lasercspace],[yes],[],[],[])
***************
*** 215,221 ****
PLAYER_ADD_DRIVER([laserrescan],[yes],[],[],[])
! PLAYER_ADD_DRIVER([laservisualbarcode],[no],[],[],[])
! PLAYER_ADD_DRIVER([laservisualbw],[no],[],[],[])
PLAYER_ADD_DRIVER([linuxjoystick],[yes],[linux/joystick.h],[],[])
--- 219,227 ----
PLAYER_ADD_DRIVER([laserrescan],[yes],[],[],[])
! PLAYER_ADD_DRIVER([lasersafe],[yes],[],[],[])
! PLAYER_ADD_DRIVER([laservisualbarcode],[yes],[],[],[])
!
! PLAYER_ADD_DRIVER([laservisualbw],[yes],[],[],[])
PLAYER_ADD_DRIVER([linuxjoystick],[yes],[linux/joystick.h],[],[])
***************
*** 249,252 ****
--- 255,262 ----
PLAYER_ADD_DRIVER([p2os],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([erratic],[yes],[],[],[])
+
+ PLAYER_ADD_DRIVER([wbr914],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([passthrough],[no],[],[],
["../client_libs/c/playercclient.o"])
***************
*** 256,259 ****
--- 266,271 ----
PLAYER_ADD_DRIVER([reb],[no],[],[],[])
+ PLAYER_ADD_DRIVER([relay],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([rflex],[yes],[],[],[])
***************
*** 280,285 ****
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $HOWL_LIBS"
! PLAYER_ADD_DRIVER([shapetracker],[no],[],[],[],
[OPENCV],[opencv])
PLAYER_ADD_DRIVER([sicklms200],[yes],[],[],[])
--- 292,298 ----
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $HOWL_LIBS"
! PLAYER_ADD_DRIVER([shapetracker],[yes],[],[],[],
[OPENCV],[opencv])
+ PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
PLAYER_ADD_DRIVER([sicklms200],[yes],[],[],[])
***************
*** 298,313 ****
fi
! PLAYER_ADD_DRIVER([simpleshape],[no],
[],[],[],[OPENCV],[opencv])
PLAYER_ADD_DRIVER([sphere],[yes],[linux/videodev.h],[],[])
! PLAYER_ADD_DRIVER([sphinx2],[yes],["sphinx2/s2types.h"],
[],["-lsphinx2 -lsphinx2fe -lsphinx2ad"])
PLAYER_ADD_DRIVER([sonyevid30],[yes],[],[],[])
! PLAYER_ADD_DRIVER([upcbarcode],[no],[],[],[],
[OPENCV],[opencv])
PLAYER_ADD_DRIVER([urglaser],[yes],[],[],[])
--- 311,328 ----
fi
! PLAYER_ADD_DRIVER([simpleshape],[yes],
[],[],[],[OPENCV],[opencv])
+ PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
PLAYER_ADD_DRIVER([sphere],[yes],[linux/videodev.h],[],[])
! PLAYER_ADD_DRIVER([sphinx2],[yes],["sphinx2/CM_macros.h"],
[],["-lsphinx2 -lsphinx2fe -lsphinx2ad"])
PLAYER_ADD_DRIVER([sonyevid30],[yes],[],[],[])
! PLAYER_ADD_DRIVER([upcbarcode],[yes],[],[],[],
[OPENCV],[opencv])
+ PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
PLAYER_ADD_DRIVER([urglaser],[yes],[],[],[])
***************
*** 332,335 ****
--- 347,351 ----
dnl WSN support
PLAYER_ADD_DRIVER([mica2],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([rcore_xbridge],[yes],[libparticle.h],[],["-lparticle"])
dnl The wavefront driver can make use of MD5 hash functions, if present
Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/player/configure.ac,v
retrieving revision 1.60.2.4
retrieving revision 1.60.2.5
diff -C2 -d -r1.60.2.4 -r1.60.2.5
*** configure.ac 31 May 2006 22:21:18 -0000 1.60.2.4
--- configure.ac 7 Jun 2006 16:12:37 -0000 1.60.2.5
***************
*** 3,7 ****
dnl Initialize autoconf with name and version of package to be built.
dnl PACKAGE and VERSION will be so defined in <config.h>.
! AC_INIT(player,2.0.1)
dnl this is used by libtool to assign version numbers
--- 3,7 ----
dnl Initialize autoconf with name and version of package to be built.
dnl PACKAGE and VERSION will be so defined in <config.h>.
! AC_INIT(player,2.1)
dnl this is used by libtool to assign version numbers
***************
*** 98,111 ****
AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
dnl Do we have Python development tools?
AC_MSG_CHECKING([for the distutils Python package])
! ac_distutils_result=`python -c "import distutils" 2>&1`
if test -z "$ac_distutils_result"; then
AC_MSG_RESULT([yes])
have_pythondev=yes
else
! AC_MSG_RESULT([no; Python extensions will not be built])
have_pythondev=no
fi
AM_CONDITIONAL(HAVE_PYTHONDEV, test "x$have_pythondev" = "xyes")
--- 98,121 ----
AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
+ dnl Check for python c header
+ PYTHON_VERSION=`python -V 2>&1 | grep -o "[[0-9]].[[0-9]]"`
+ PYTHON_HEADER="python"$PYTHON_VERSION"/Python.h"
+ if test ! -f "/usr/include/$PYTHON_HEADER"; then
+ PYTHON_HEADER=python/Python.h
+ fi
+
+ AC_CHECK_HEADER($PYTHON_HEADER,
dnl Do we have Python development tools?
AC_MSG_CHECKING([for the distutils Python package])
! ac_distutils_result=`python -c "import distutils" 2>&1 | grep ImportError`
if test -z "$ac_distutils_result"; then
AC_MSG_RESULT([yes])
have_pythondev=yes
else
! AC_MSG_RESULT([Python extensions will not be built])
have_pythondev=no
fi
+ , AC_MSG_RESULT([no; Python extensions will not be built])
+ have_pythondev=no)
AM_CONDITIONAL(HAVE_PYTHONDEV, test "x$have_pythondev" = "xyes")
***************
*** 380,387 ****
have_libjpeg=no)
AM_CONDITIONAL(INCLUDE_JPEG, test "x$have_libjpeg" = "xyes")
dnl Check for OpenCV
if test "x$have_pkg_config" = "xyes"; then
! PKG_CHECK_MODULES(OPENCV, opencv, with_opencv=yes, with_gtk=no)
if test "x$with_opencv" = "xyes"; then
AC_DEFINE(HAVE_OPENCV, 1, [OpenCV library is present])
--- 390,416 ----
have_libjpeg=no)
AM_CONDITIONAL(INCLUDE_JPEG, test "x$have_libjpeg" = "xyes")
+ AC_CHECK_LIB(GL,glBegin,
+ have_libGL=yes
+ AC_DEFINE(HAVE_LIBGL, 1, [Define to 1 if you have the GL library
(-lGL). ])
+ LIBS="$LIBS -lGL",
+ have_libGL=no)
+ AM_CONDITIONAL(INCLUDE_GL, test "x$have_libGL" = "xyes")
+ AC_CHECK_LIB(GLU,main,
+ have_libGLU=yes
+ AC_DEFINE(HAVE_LIBGLU, 1, [Define to 1 if you have the GLU
library (-lGLU). ])
+ LIBS="$LIBS -lGLU",
+ have_libGLU=no)
+ AM_CONDITIONAL(INCLUDE_GLU, test "x$have_libGLU" = "xyes")
+ AC_CHECK_LIB(glut,main,
+ have_libglut=yes
+ AC_DEFINE(HAVE_LIBGLUT, 1, [Define to 1 if you have the GLUT
library (-lGglut). ])
+ LIBS="$LIBS -lglut",
+ have_libglut=no)
+ AM_CONDITIONAL(INCLUDE_GLUT, test "x$have_libglut" = "xyes")
+
dnl Check for OpenCV
if test "x$have_pkg_config" = "xyes"; then
! PKG_CHECK_MODULES(OPENCV, opencv, with_opencv=yes, with_opencv=no)
if test "x$with_opencv" = "xyes"; then
AC_DEFINE(HAVE_OPENCV, 1, [OpenCV library is present])
***************
*** 397,400 ****
--- 426,439 ----
AM_CONDITIONAL(WITH_IMAGEMAGICK, test "x$with_imagemagick" = "xyes")
+ dnl check for gsl
+ if test "x$have_pkg_config" = "xyes"; then
+ PKG_CHECK_MODULES(GSL, gsl, with_gsl=yes, with_gsl=no)
+ if test "x$with_gsl" = "xyes"; then
+ AC_DEFINE(HAVE_GSL, 1, [GSL library is present])
+ fi
+ fi
+ AM_CONDITIONAL(WITH_GSL, test "x$with_gsl" = "xyes")
+
+
dnl Optionally build python bindings to libplayerc (libplayerc-py)
AC_ARG_ENABLE(libplayerc-py,
***************
*** 441,447 ****
--- 480,489 ----
server/libplayerdrivers/playerdrivers.pc
server/drivers/Makefile
+ server/drivers/base/Makefile
server/drivers/gps/Makefile
server/drivers/shell/Makefile
server/drivers/mixed/Makefile
+ server/drivers/mixed/wbr/Makefile
+ server/drivers/mixed/wbr/914/Makefile
server/drivers/position/Makefile
server/drivers/audio/Makefile
***************
*** 454,457 ****
--- 496,500 ----
server/drivers/camera/imageseq/Makefile
server/drivers/camera/sphere/Makefile
+ server/drivers/camera/uvc/Makefile
server/drivers/fiducial/Makefile
server/drivers/ptz/Makefile
***************
*** 459,462 ****
--- 502,506 ----
server/drivers/waveform/Makefile
server/drivers/blobfinder/Makefile
+ server/drivers/blobfinder/artoolkitplus/Makefile
server/drivers/blobfinder/cmvision/Makefile
server/drivers/blobfinder/upcbarcode/Makefile
***************
*** 469,472 ****
--- 513,517 ----
server/drivers/mixed/cmucam2/Makefile
server/drivers/mixed/p2os/Makefile
+ server/drivers/mixed/erratic/Makefile
server/drivers/mixed/rflex/Makefile
server/drivers/mixed/reb/Makefile
***************
*** 488,491 ****
--- 533,537 ----
server/drivers/position/ascension/Makefile
server/drivers/position/bumpersafe/Makefile
+ server/drivers/position/lasersafe/Makefile
server/drivers/mcom/Makefile
server/drivers/localization/Makefile
***************
*** 494,499 ****
server/drivers/map/Makefile
server/drivers/joystick/Makefile
! server/drivers/rfid/Makefile
! server/drivers/wsn/Makefile
client_libs/Makefile
client_libs/libplayerc++/Makefile
--- 540,545 ----
server/drivers/map/Makefile
server/drivers/joystick/Makefile
! server/drivers/rfid/Makefile
! server/drivers/wsn/Makefile
client_libs/Makefile
client_libs/libplayerc++/Makefile
***************
*** 511,516 ****
examples/plugins/exampledriver/Makefile
examples/plugins/multidriver/Makefile
! examples/plugins/opaquedriver/Makefile
! examples/libplayerc/Makefile
examples/libplayerc++/Makefile
utils/Makefile
--- 557,562 ----
examples/plugins/exampledriver/Makefile
examples/plugins/multidriver/Makefile
! examples/plugins/opaquedriver/Makefile
! examples/libplayerc/Makefile
examples/libplayerc++/Makefile
utils/Makefile
***************
*** 522,525 ****
--- 568,572 ----
utils/playerprint/Makefile
utils/playervcr/Makefile
+ utils/pmap/Makefile
utils/dgps_server/Makefile
dnl utils/barcodes/Makefile
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
