debian/0000755000000000000000000000000012312611151007157 5ustar debian/patches-dfsg/0000755000000000000000000000000012234172636011544 5ustar debian/patches-dfsg/00-replace-cmake-list.patch0000644000000000000000000000333712234157477016460 0ustar diff -Nur a/replace/CMakeLists.txt b/replace/CMakeLists.txt --- a/replace/CMakeLists.txt 2009-08-11 05:44:43.000000000 +0200 +++ b/replace/CMakeLists.txt 2010-03-04 17:19:00.000000000 +0100 @@ -1,20 +1,20 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace) IF (PLAYER_OS_WIN) - INSTALL (FILES rpc/xdr.h rpc/types.h DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR}/rpc COMPONENT headers) +# INSTALL (FILES rpc/xdr.h rpc/types.h DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR}/rpc COMPONENT headers) INSTALL (FILES replace.h DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR} COMPONENT headers) ENDIF (PLAYER_OS_WIN) -IF (NOT HAVE_XDR) - SET (replaceSrcs ${replaceSrcs} - xdr.c - xdr_array.c - xdr_float.c - xdr_intXX_t.c - xdr_mem.c - xdr_sizeof.c) - SET (ws2_32lib Ws2_32) -ENDIF (NOT HAVE_XDR) +#IF (NOT HAVE_XDR) +# SET (replaceSrcs ${replaceSrcs} +# xdr.c +# xdr_array.c +# xdr_float.c +# xdr_intXX_t.c +# xdr_mem.c +# xdr_sizeof.c) +# SET (ws2_32lib Ws2_32) +#ENDIF (NOT HAVE_XDR) IF (NOT HAVE_GETOPT) SET (replaceSrcs ${replaceSrcs} getopt.c) @@ -28,9 +28,9 @@ SET (replaceSrcs ${replaceSrcs} clock_gettime.c) ENDIF (NOT HAVE_CLOCK_GETTIME) -IF (NOT HAVE_GETTIMEOFDAY) - SET (replaceSrcs ${replaceSrcs} gettimeofday.c) -ENDIF (NOT HAVE_GETTIMEOFDAY) +#IF (NOT HAVE_GETTIMEOFDAY) +# SET (replaceSrcs ${replaceSrcs} gettimeofday.c) +#ENDIF (NOT HAVE_GETTIMEOFDAY) IF (NOT HAVE_CFMAKERAW) SET (replaceSrcs ${replaceSrcs} cfmakeraw.c) debian/libplayerinterface3.0.install0000644000000000000000000000004012234157477014651 0ustar usr/lib/libplayerinterface.so.* debian/docs0000644000000000000000000000001712234157477010053 0ustar README AUTHORS debian/compat0000644000000000000000000000000212234157477010400 0ustar 7 debian/libplayerc3.0.install0000644000000000000000000000003012234157477013132 0ustar usr/lib/libplayerc.so.* debian/libplayertcp3.0-dev.install0000644000000000000000000000022212234157477014255 0ustar usr/lib/libplayertcp.so usr/lib/libplayerudp.so usr/lib/pkgconfig/playertcp.pc usr/lib/pkgconfig/playerudp.pc usr/include/player-3.0/libplayertcp debian/rules0000755000000000000000000000151112235612635010251 0ustar #!/usr/bin/make -f -include /usr/share/dpkg/architecture.mk RENAMED_BINARIES=player playerv playercam playerjoy playernav playerprint playervcr playerwritemap pmaptest %: dh $@ override_dh_clean: dh_clean # for some reason, the build makes this file in the main source rm -f doc/player.tag override_dh_install: for i in $(RENAMED_BINARIES); do mv -v debian/tmp/usr/bin/$$i debian/tmp/usr/bin/robot-$$i; done install -d debian/tmp/usr/share/doc/player mv -f debian/tmp/usr/share/doc/player-3.0.2 debian/tmp/usr/share/doc/player/html dh_install override_dh_auto_configure: dh_auto_configure -- -DCMAKE_SKIP_RPATH=TRUE -DBUILD_DOCUMENTATION=TRUE -DBUILD_PYTHONC_BINDINGS=OFF -DBUILD_PYTHONCPP_BINDINGS=OFF override_dh_auto_build: dh_auto_build # docs don't get built automatically (cd obj-$(DEB_BUILD_GNU_TYPE) && make doc) debian/copyright0000644000000000000000000000530512234157477011140 0ustar This package was debianized by Michael Janssen on Mon, 14 May 2007 23:57:23 -0500. It was downloaded from http://playerstage.sourceforge.net Upstream Authors: Brian Gerkey Andrew Howard Richard Vaughan and others Copyright: Copyright 2000-2007 Brian Gerkey Copyright 2000-2007 Andrew Howard Copyright 2000-2007 Richard Vaughan and others License: (From doc/player.txt) Player source and documentation is released under the terms of the GNU General Public License v2. A copy of the license is included with the sourcecode in the file COPYING. Copying and redistribution is permitted only under the terms of the license. Client libraries are simultaneously released under the terms of the GNU Lesser General Public License v2.1. The GPL: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian Systems, the GPL version 2 is available at /usr/share/common-licenses/GPL-2 The LGPL: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian Systems, the LGPL version 2.1 is available at /usr/share/common-licenses/LGPL-2.1 The Debian packaging is Copyright 2007-2009, Michael Janssen and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. debian/robot-player.manpages0000644000000000000000000000034212234157477013335 0ustar debian/robot-player.1 debian/robot-playercam.1 debian/robot-playerjoy.1 debian/robot-playernav.1 debian/robot-playerprint.1 debian/robot-playerv.1 debian/robot-playervcr.1 debian/robot-playerwritemap.1 debian/robot-pmaptest.1 debian/libplayerwkb3.0-dev.install0000644000000000000000000000013312234157477014253 0ustar usr/lib/libplayerwkb.so usr/lib/pkgconfig/playerwkb.pc usr/include/player-3.0/libplayerwkb debian/robot-player-doc.doc-base0000644000000000000000000000036412234157477013766 0ustar Document: robot-player-doc Title: Player manual Abstract: This manual describes how to use the Player server and libraries Section: Programming Format: html Index: /usr/share/doc/player/html/index.html Files: /usr/share/doc/player/html/*.html debian/robot-playercam.10000644000000000000000000000316512234157477012371 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playercam "1" "May 2009" "Player" .SH NAME robot-playercam \- camera test utility for a player camera .SH SYNOPSIS .B robot-playercam .RI [options] .SH DESCRIPTION .B robot-playercam is a gui client that displays images captured from a player camera and/or blobfinder device. .SH OPTIONS .TP .B -help Output a help message. .TP .BI "-h " hostname host that is running player. .TP .BI "-p " port the port number of the host. .TP .BI "-i " index the index of the camera. .TP .BI "-b " index the index of the blobfinder. .TP .BI "-r " rate the refresh rate of the video. .TP .BI "-t " transport transport to use (either "tcp" or "udp"). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/libplayerdrivers3.0.install0000644000000000000000000000003612234157477014374 0ustar usr/lib/libplayerdrivers.so.* debian/source/0000755000000000000000000000000012234172636010474 5ustar debian/source/format0000644000000000000000000000001412234157477011710 0ustar 3.0 (quilt) debian/robot-playerprint.10000644000000000000000000000347312234157477012767 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playerprint "1" "May 2009" "Player" .SH NAME robot-playerprint \- prints out sensor data to the console .SH SYNOPSIS .B robot-playerprint .RI [options] " " .SH DESCRIPTION .B robot-playerprint prints out sensor data to the console. It is useful mainly for verifying that a device is working during the setup or debugging process. If you want to visualize data, try robot-playerv. If you want to log data to a file, try the writelog driver. .SH OPTIONS .TP .BI "-h " host connect to Player on this .I host (default: localhost). .TP .BI "-p " port connect to Player on this TCP .I port (default: 6665). .TP .BI "-r " rate request data update at .I rate in Hz (default: 10Hz). .TP .BI "-i " index the .I index of the device (default: 0). .TP .B device name of the sensor to print data from (e.g. laser). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. .BR robot-playerv (1) debian/robot-playerwritemap.10000644000000000000000000000306012234157477013453 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playerwritemap "1" "May 2009" "Player" .SH NAME robot-playerwritemap \- map data logger .SH SYNOPSIS .B robot-playerwritemap .RI [options] .SH DESCRIPTION .B robot-playerwritemap retrieves map data and save it to a file. .SH OPTIONS .TP .BI "-h " host connect to Player on this .I host (default: localhost). .TP .BI "-p " port connect to Player on this TCP .I port (default: 6665). .TP .BI "-m " {v|o} save map as vector (v) or occ grid (o) map (default: o). .TP .BI "-i " index .I index of the device to get the map data from (default: 0). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. .BR robot-playervcr (1) debian/robot-playervcr.10000644000000000000000000000312612234157477012420 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playervcr "1" "May 2009" "Player" .SH NAME robot-playervcr \- GUI client that provides VCR-like control over logfiles .SH SYNOPSIS .B robot-playervcr .RI [options] .SH DESCRIPTION .B robot-playervcr is a GUI client that provides VCR-like control over the recording and playback of logfiles. It does this via the log interface of the writelog and readlog drivers, respectively. .SH OPTIONS .TP .BI "-h " host connect to Player on this .I host (default: localhost). .TP .BI "-p " port connect to Player on this TCP .I port (default: 6665). .TP .BI "-i " index the .I index of the device (default: 0). .TP .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/robot-pmaptest.10000644000000000000000000000657112234157477012255 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-pmaptest "1" "May 2009" "Player" .SH NAME robot-pmaptest \- occupancy grid map creation tool .SH SYNOPSIS .B robot-pmaptest .RI [options] " " .SH DESCRIPTION .B robot-pmaptest is utility demonstrates the basic functionality of the pmap library and serves a handy mapping utility in its own right. Given a Player logfile containing odometry and laser data, robot-pmaptest will produce an occupancy grid map of the environment. .SH OPTIONS .TP .B -g disable the GUI (run in console mode only). .TP .BI "--range_max " range maximum effective .I range for the laser in meter (default: range saved in logfile). .TP .BI "--position_index " index .I index of odometry device in logfile (defualt: 0). .TP .BI "--laser_index " index .I index of laser device in logfile (default: 0). .TP .BI "--num_samples " number .I number of samples in particle filter (default: 200). .TP .BI "--resample_interval " number .I number of scans between resampling steps. .TP .BI "--resample_sigma " width .I width of resampling gaussian. .TP .BI "--num_cycles " number .I number of optimization cycles in the fine phase (default: 100). .TP .BI "--robot_x " position initial .I position of the robot on the x-axis. .TP .BI "--robot_y " position initial .I position of the robot on the y-axis. .TP .BI "--robot_rot " rotation initial .I rotation of the robot in degrees. .TP .BI "--grid_width " width .I width of the grid in meters (default: 64.0). .TP .BI "--grid_height " height .I height of the grid in meters (default: 48.0). .TP .BI "--grid_scale " scale .I scale of the grid in meters per cell (default: 0.10). .TP .BI "--laser_x " position .I position of the laser scanner on the robot. .TP .BI "--laser_rot " rotation .I rotation of the laser scanner on the robot in degrees. .TP .BI "--robot_hostname " hostname the .I hostname of the robot to verify in the logfile. .TP .BI "--robot_hostname " hostname the .I hostname of the robot to verify in the logfile. .TP .BI "--skip " time amount of .I time to skip between log entries. .TP .BI "--range_res" resolution resolution of the laser (only used inlodo, not lodo2 which is currentlyused). .TP .BI "--action_model_xx " factor believe .I factors in the change of the robot's pose. .TP .BI "--action_model_rx " factor believe .I factors in the change of the robot's pose. .TP .BI "--action_model_rr " factor believe .I factors in the change of the robot's pose. .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. .BR robot-playervcr (1) debian/liblodo3.0-dev.install0000644000000000000000000000007112234157477013211 0ustar usr/lib/liblodo.so usr/include/player-3.0/libpmap/lodo.h debian/python-playerc.install0000644000000000000000000000010712234157477013546 0ustar usr/lib/python*/site-packages/*.py usr/lib/python*/site-packages/*.so debian/pycompat0000644000000000000000000000000212234157477010751 0ustar 2 debian/playerinterfacegen.10000644000000000000000000000261012234157477013132 0ustar .\" Copyright (C) 2010 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH playerinterfacegen "1" "Deb 2010" "Player" .SH NAME playerinterfacegen \- automatically generate libplayeinterface functions .SH SYNOPSIS .B playerinterfacegen .RI [--header " " | " " --functiontable " " | " " --utils] " " [--plugin] " " [ " " | " " ] .SH DESCRIPTION .B playerinterfacegen generates C headers implementing a passed player interface description. .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/libplayerdrivers3.0-dev.install0000644000000000000000000000014712234157477015153 0ustar usr/lib/libplayerdrivers.so usr/lib/pkgconfig/playerdrivers.pc usr/include/player-3.0/libplayerdrivers debian/robot-playernav.10000644000000000000000000000423612234157477012415 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playernav "1" "May 2009" "Player" .SH NAME robot-playernav \- GUI client to control over localize and planner devices .SH SYNOPSIS .B robot-playernav .RI [options] " " " " [...] .SH DESCRIPTION .B robot-playernav is a GUI client that provides control over localize and planner devices. It allows you to set your robots' localization hypotheses by dragging and dropping them in the map. You can set global goals the same way, and see the planned paths and the robots' progress toward the goals. robot-playernav can also display (a subset of) the localization system's current particle set, which may help in debugging localization. You can think of playernav as an Operator Control Unit (OCU). robot-playernav can also be used just to view a map. .SH OPTIONS .TP .BI "-fps " dumprate dump screenshots rate in Hz (default: 5Hz). .TP .BI "-zoom " zoomlevel initial level of zoom in the display (default: 1). .TP .BI "-aa " {0|1} use anti-aliased canvas for display (0 == false; 1 == true). The anti-aliased canvas looks nicer but may require more processor cycles (default: 1). .TP .BI "-map " map_idx the index of the map to be requested and displayed (default: 0). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/libplayerjpeg3.0-dev.install0000644000000000000000000000007612234157477014423 0ustar usr/lib/libplayerjpeg.so usr/include/player-3.0/libplayerjpeg debian/watch0000644000000000000000000000014212234157477010230 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://sf.net/playerstage/player-(.+)\.tar\.gz debian debian/robot-player.install0000644000000000000000000000036112234157477013211 0ustar usr/bin/robot-player usr/bin/robot-playercam usr/bin/robot-playerjoy usr/bin/robot-playernav usr/bin/robot-playerprint usr/bin/robot-playerv usr/bin/robot-playervcr usr/bin/robot-playerwritemap usr/bin/robot-pmaptest usr/share/player/config debian/libwavefront-standalone3.0-dev.install0000644000000000000000000000005512234157477016417 0ustar usr/include/player-3.0/libstandalone_drivers debian/patches/0000755000000000000000000000000012312611151010606 5ustar debian/patches/fix-ftbfs-invalid-cast-to-pointer.patch0000644000000000000000000000213212234157477020212 0ustar Description: Fix undefined function & cast to pointer from integer of different size Origin: commit, revision id: dmitrijs.ledkovs@canonical.com-20120808110300-ajslacll9spgvc9k Author: Dmitrijs Ledkovs Last-Update: 2012-08-08 X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20120808110300-ajslacll9spgvc9k Index: b/client_libs/libplayerc/bindings/python/playerc_swig_parse.py =================================================================== --- a/client_libs/libplayerc/bindings/python/playerc_swig_parse.py +++ b/client_libs/libplayerc/bindings/python/playerc_swig_parse.py @@ -219,6 +219,7 @@ file.write(accessor_header.replace("TYPE",type)) # write the modified header file. file.write(ifaceStream) + file.write('#define _playerc_client_t_read(client) playerc_client_read(client)\n') file.close() # find the names of all the structures defined in the file, and make @@ -268,4 +269,4 @@ file.write(accessor_interface.replace("TYPE",type)) file.write(ifaceStream) file.close() - \ No newline at end of file + debian/patches/0002-Fix-FTBS-on-armel-alpha-and-ia64.patch0000644000000000000000000000446512234157477017620 0ustar From: Michael Janssen Date: Sat, 4 Dec 2010 02:28:05 -0600 Subject: Fix FTBS on armel, alpha and ia64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix FTBS on armel, alpha and ia64 by using non-paused port io operations instead of the ā€œ_pā€ onces not defined on this architectures Thanks to Daniel Hess for this patch --- server/drivers/dio/portio/portio.cc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/server/drivers/dio/portio/portio.cc b/server/drivers/dio/portio/portio.cc index eb32cbc..f5ec06c 100644 --- a/server/drivers/dio/portio/portio.cc +++ b/server/drivers/dio/portio/portio.cc @@ -179,8 +179,12 @@ void PortIO::MainQuit() #ifdef __QNXNTO__ out8(this->portptr, this->init_val); #else +#if defined(__alpha__) || defined(__arm__) || defined(__ia64__) + outb(this->init_val, this->port); +#else outb_p(this->init_val, this->port); #endif +#endif } void PortIO::Main() @@ -191,8 +195,12 @@ void PortIO::Main() #ifdef __QNXNTO__ this->init_val = in8(this->portptr); #else +#if defined(__alpha__) || defined(__arm__) || defined(__ia64__) + this->init_val = inb(this->port); +#else this->init_val = inb_p(this->port); #endif +#endif for (;;) { pthread_testcancel(); @@ -208,8 +216,12 @@ void PortIO::Main() #ifdef __QNXNTO__ data.bits = in8(this->portptr); #else +#if defined(__alpha__) || defined(__arm__) || defined(__ia64__) + data.bits = inb(this->port); +#else data.bits = inb_p(this->port); #endif +#endif this->Publish(this->dio_provided_addr, PLAYER_MSGTYPE_DATA, PLAYER_DIO_DATA_VALUES, reinterpret_cast(&data), 0, NULL); } } @@ -236,16 +248,24 @@ int PortIO::ProcessMessage(QueuePointer & resp_queue, player_msghdr * hdr, void #ifdef __QNXNTO__ u = in8(this->portptr); #else +#if defined(__alpha__) || defined(__arm__) || defined(__ia64__) + u = inb(this->port); +#else u = inb_p(this->port); #endif +#endif v = (u & (~(masks[digits - 1]))) | (cmd.digout & (masks[digits - 1])); if (u != v) { #ifdef __QNXNTO__ out8(this->portptr, v); #else +#if defined(__alpha__) || defined(__arm__) || defined(__ia64__) + outb(v, this->port); +#else outb_p(v, this->port); #endif +#endif } return 0; } debian/patches/series0000644000000000000000000000106012312611112012015 0ustar 0001-rename-lib64-directory-in-cmake.patch 0002-Fix-FTBS-on-armel-alpha-and-ia64.patch 0003-Fix-FTBS-on-mips-and-mipsel.patch 0004-Move-example-cmake-module-files.patch 0005-Raise-python-exceptions-correctly.patch 0006-Add-debian-plugins-directory.patch 0007-Use-libv4l1-videodev-compatibility.patch 0008-Update-for-new-libgeos-FTBFS.patch 0009-Fix-zlib-1.2.6-FTBFS.patch boost1.54 unresolved-symbols-so.diff fix-ftbfs-invalid-cast-to-pointer.patch Fix-bogus-assertion-that-cause-playercam-to-crash.patch link-asound.patch 0010-fix-ftbfs-libstatgrab0.90.patch debian/patches/boost1.540000644000000000000000000000240712234157502012202 0ustar Description: Fix FTBFS with boost 1.54 Author: Nobuhiro Iwamatsu Bug-Debian: http://bugs.debian.org/710628 --- player-3.0.2+dfsg.orig/client_libs/libplayerc++/playerclient.cc +++ player-3.0.2+dfsg/client_libs/libplayerc++/playerclient.cc @@ -168,7 +168,7 @@ void PlayerClient::RunThread() Read(); }; boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); // we sleep for 0 seconds boost::thread::sleep(xt); } --- player-3.0.2+dfsg.orig/client_libs/libplayerc++/CMakeLists.txt +++ player-3.0.2+dfsg/client_libs/libplayerc++/CMakeLists.txt @@ -104,6 +104,8 @@ IF (BUILD_PLAYERCC) "PlayerC++ client library will be built with Boost::Thread support.") SET (boostThreadLib boost_thread${BOOST_LIB_SUFFIX}) PLAYERCC_ADD_LINK_LIB (${boostThreadLib}) + SET (boostSystemLib boost_system${BOOST_LIB_SUFFIX}) + PLAYERCC_ADD_LINK_LIB (${boostSystemLib}) PLAYERCC_ADD_INCLUDE_DIR (${Boost_INCLUDE_DIR}) PLAYERCC_ADD_LINK_DIR (${Boost_LIBRARY_DIRS}) SET (boostIncludeDir ${Boost_INCLUDE_DIRS}) debian/patches/Fix-bogus-assertion-that-cause-playercam-to-crash.patch0000644000000000000000000000207012234171766023243 0ustar Description: Fix bogus assertion that cause playercam to crash Author: Stefan Herbrechtsmeier Bug-Debian: http://bugs.debian.org/979841 Origin: upstream, http://sourceforge.net/p/playerstage/svn/8941 --- --- a/utils/playercam/playercam.c +++ b/utils/playercam/playercam.c @@ -467,7 +467,7 @@ { // Decompress the image if necessary playerc_camera_decompress(g_camera); - assert(allocated_size > g_camera->image_count*3); + assert(allocated_size >= g_camera->image_count); // figure out the colorspace switch (g_camera->format) { --- a/server/drivers/audio/CMakeLists.txt +++ b/server/drivers/audio/CMakeLists.txt @@ -1,4 +1,4 @@ PLAYERDRIVER_OPTION (alsa build_alsa ON) PLAYERDRIVER_REJECT_OS (alsa build_alsa PLAYER_OS_WIN) PLAYERDRIVER_REQUIRE_HEADER (alsa build_alsa alsa/asoundlib.h) -PLAYERDRIVER_ADD_DRIVER (alsa build_alsa LINKFLAGS "-lasound" SOURCES alsa.cc audio_sample.cc) +PLAYERDRIVER_ADD_DRIVER (alsa build_alsa LINKLIBS "asound" LINKFLAGS "-lasound" SOURCES alsa.cc audio_sample.cc) debian/patches/boost1.53.patch0000644000000000000000000000224512234157477013312 0ustar Description: Use boost::TIME_UTC_ fixes FTBFS with boost1.53. Author: Dmitrijs Ledkovs --- a/client_libs/libplayerc++/playerclient.cc +++ b/client_libs/libplayerc++/playerclient.cc @@ -168,7 +168,7 @@ Read(); }; boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); // we sleep for 0 seconds boost::thread::sleep(xt); } --- a/client_libs/libplayerc++/CMakeLists.txt +++ b/client_libs/libplayerc++/CMakeLists.txt @@ -103,7 +103,9 @@ MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Thread support.") SET (boostThreadLib boost_thread${BOOST_LIB_SUFFIX}) + SET (boostSystemLib boost_system${BOOST_LIB_SUFFIX}) PLAYERCC_ADD_LINK_LIB (${boostThreadLib}) + PLAYERCC_ADD_LINK_LIB (${boostSystemLib}) PLAYERCC_ADD_INCLUDE_DIR (${Boost_INCLUDE_DIR}) PLAYERCC_ADD_LINK_DIR (${Boost_LIBRARY_DIRS}) SET (boostIncludeDir ${Boost_INCLUDE_DIRS}) debian/patches/0004-Move-example-cmake-module-files.patch0000644000000000000000000001053412234157477020236 0ustar From: Michael Janssen Date: Mon, 6 Dec 2010 22:46:24 -0600 Subject: Move example cmake module files --- examples/libplayerc++/CMakeLists.txt.example.in | 2 +- examples/libplayerc/CMakeLists.txt.example.in | 2 +- .../exampledriver/CMakeLists.txt.example.in | 2 +- .../exampleinterface/CMakeLists.txt.example.in | 2 +- .../plugins/multidriver/CMakeLists.txt.example.in | 2 +- .../plugins/opaquedriver/CMakeLists.txt.example.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/libplayerc++/CMakeLists.txt.example.in b/examples/libplayerc++/CMakeLists.txt.example.in index 917162a..38589df 100644 --- a/examples/libplayerc++/CMakeLists.txt.example.in +++ b/examples/libplayerc++/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerc++_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerC++) SET (HAVE_GETOPT @HAVE_GETOPT@) diff --git a/examples/libplayerc/CMakeLists.txt.example.in b/examples/libplayerc/CMakeLists.txt.example.in index 0f6adde..7c84f32 100644 --- a/examples/libplayerc/CMakeLists.txt.example.in +++ b/examples/libplayerc/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerc_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerC) PLAYER_ADD_PLAYERC_CLIENT (simple SOURCES simple.c) diff --git a/examples/plugins/exampledriver/CMakeLists.txt.example.in b/examples/plugins/exampledriver/CMakeLists.txt.example.in index fa059c9..14d6108 100644 --- a/examples/plugins/exampledriver/CMakeLists.txt.example.in +++ b/examples/plugins/exampledriver/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerplugin_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerPlugin) PLAYER_ADD_PLUGIN_DRIVER (exampledriver SOURCES exampledriver.cc) diff --git a/examples/plugins/exampleinterface/CMakeLists.txt.example.in b/examples/plugins/exampleinterface/CMakeLists.txt.example.in index f3c3ef2..0046567 100644 --- a/examples/plugins/exampleinterface/CMakeLists.txt.example.in +++ b/examples/plugins/exampleinterface/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerplugin_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerPlugin) INCLUDE (UsePlayerC) diff --git a/examples/plugins/multidriver/CMakeLists.txt.example.in b/examples/plugins/multidriver/CMakeLists.txt.example.in index 0e7d0da..e84467c 100644 --- a/examples/plugins/multidriver/CMakeLists.txt.example.in +++ b/examples/plugins/multidriver/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerplugin_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerPlugin) PLAYER_ADD_PLUGIN_DRIVER (multidriver SOURCES multidriver.cc) diff --git a/examples/plugins/opaquedriver/CMakeLists.txt.example.in b/examples/plugins/opaquedriver/CMakeLists.txt.example.in index 6bd2ef3..c9d620b 100644 --- a/examples/plugins/opaquedriver/CMakeLists.txt.example.in +++ b/examples/plugins/opaquedriver/CMakeLists.txt.example.in @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR) PROJECT (playerplugin_examples) # Include this CMake module to get most of the settings needed to build -SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/share/cmake/Modules") +SET (CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/lib/player-3.0") INCLUDE (UsePlayerPlugin) INCLUDE (UsePlayerC) debian/patches/unresolved-symbols-so.diff0000644000000000000000000000160712234157477015762 0ustar Description: link libplayerdrivers.so with -lpq to fix build failure with ld --as-needed. Author: Matthias Klose Bug-Debian: http://bugs.debian.org/607221 --- player-3.0.1+dfsg.orig/server/drivers/vectormap/CMakeLists.txt +++ player-3.0.1+dfsg/server/drivers/vectormap/CMakeLists.txt @@ -8,11 +8,11 @@ PLAYERDRIVER_REQUIRE_PKG (postgis build_ IF (PLAYER_OS_SOLARIS) SET (pqLinkFlag "-lpq") ELSE (PLAYER_OS_SOLARIS) - SET (pqLinkFlag) + SET (pqLinkFlag "-lpq") ENDIF (PLAYER_OS_SOLARIS) PLAYERDRIVER_ADD_DRIVER (postgis build_postgis INCLUDEDIRS ${postgis_includeDirs} LIBDIRS ${postgis_libDirs} - LINKLIBS ${postgis_linkLibs} LINKFLAGS ${postgis_linkFlags} ${pqLinkFlag} + LINKLIBS ${postgis_linkLibs} ${pqLinkFlag} LINKFLAGS ${postgis_linkFlags} CFLAGS ${postgis_cFlags} SOURCES postgis.cc dbconn.cc) PLAYERDRIVER_OPTION (vec2map build_vec2map ON) debian/patches/0008-Update-for-new-libgeos-FTBFS.patch0000644000000000000000000000247612234157477017331 0ustar From: Michael Janssen Date: Mon, 19 Mar 2012 17:53:45 -0500 Subject: Update for new libgeos FTBFS --- client_libs/libplayerc/CMakeLists.txt | 2 +- libplayerwkb/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client_libs/libplayerc/CMakeLists.txt b/client_libs/libplayerc/CMakeLists.txt index d43648b..0352787 100644 --- a/client_libs/libplayerc/CMakeLists.txt +++ b/client_libs/libplayerc/CMakeLists.txt @@ -72,7 +72,7 @@ IF (HAVE_Z) PLAYERC_ADD_LINK_LIB (z) ENDIF (HAVE_Z) IF (HAVE_GEOS) - PLAYERC_ADD_LINK_LIB (geos geos_c) + PLAYERC_ADD_LINK_LIB (geos_c) ENDIF (HAVE_GEOS) IF (PLAYER_OS_QNX) PLAYERC_ADD_LINK_LIB (socket rpc) diff --git a/libplayerwkb/CMakeLists.txt b/libplayerwkb/CMakeLists.txt index c50dc8e..877ca3a 100644 --- a/libplayerwkb/CMakeLists.txt +++ b/libplayerwkb/CMakeLists.txt @@ -2,9 +2,9 @@ SET (playerwkbSrcs playerwkb.c) PLAYER_ADD_LIBRARY (playerwkb ${playerwkbSrcs}) IF (HAVE_GEOS) - TARGET_LINK_LIBRARIES (playerwkb playercommon geos geos_c) + TARGET_LINK_LIBRARIES (playerwkb playercommon geos_c) PLAYERCORE_ADD_INT_LINK_LIB (geos_c) - SET (wkbLibFlag "-lgeos -lgeos_c") + SET (wkbLibFlag "-lgeos_c") ELSE (HAVE_GEOS) TARGET_LINK_LIBRARIES (playerwkb playercommon) SET (wkbLibFlag) debian/patches/0005-Raise-python-exceptions-correctly.patch0000644000000000000000000000363312234157477021006 0ustar From: Michael Janssen Date: Wed, 8 Dec 2010 22:43:40 -0600 Subject: Raise python exceptions correctly --- libplayerinterface/playerxdrgen.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libplayerinterface/playerxdrgen.py b/libplayerinterface/playerxdrgen.py index a113d0b..44b51da 100755 --- a/libplayerinterface/playerxdrgen.py +++ b/libplayerinterface/playerxdrgen.py @@ -36,7 +36,7 @@ class DataTypeMember: self.arraysize = self.arraysize[0] body = self.arraypattern.sub('', body) elif len(pointers) > 1: # This checks for things like "uint8_t* *data" - raise 'Illegal pointer declaration in struct\n' + body + raise Exception('Illegal pointer declaration in struct\n' + body) elif len(pointers) > 0: self.array = True self.arraysize = '' @@ -94,7 +94,7 @@ class DataType: varpart = self.contentspattern.findall(body) if len(varpart) != 1: print 'skipping nested / empty struct ' + typename - raise "Empty Struct" + raise Exception("Empty Struct") # separate the variable declarations decls = self.declpattern.findall(varpart[0]) for dstring in decls: @@ -174,7 +174,7 @@ int xdr_%(typename)s (XDR* xdrs, %(typename)s * msg) # Check for a matching count variable, because compulsory for dynamic arrays # FIXME: Add this test back if var.countvar not in datatype.GetVarNames(): - raise 'Missing count var "' + countvar + '" in\n' + s + raise Exception('Missing count var "' + countvar + '" in\n' + s) # First put in a check to see if unpacking, and if so allocate memory for the array sourcefile.write(' if(xdrs->x_op == XDR_DECODE)\n {\n') sourcefile.write(' if((msg->' + var.Name + ' = malloc(msg->' + var.countvar + '*sizeof(' + member.typename + '))) == NULL)\n return(0);\n') debian/patches/0001-rename-lib64-directory-in-cmake.patch0000644000000000000000000000213512234157477020102 0ustar From: Michael Janssen Date: Wed, 1 Dec 2010 19:00:29 -0600 Subject: rename lib64 directory in cmake --- cmake/internal/SetupDirectories.cmake | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmake/internal/SetupDirectories.cmake b/cmake/internal/SetupDirectories.cmake index 016a967..bfe1706 100644 --- a/cmake/internal/SetupDirectories.cmake +++ b/cmake/internal/SetupDirectories.cmake @@ -11,11 +11,6 @@ MESSAGE (STATUS "Player will be installed to ${CMAKE_INSTALL_PREFIX}") STRING (TOLOWER ${PROJECT_NAME} projectNameLower) SET (PLAYER_INCLUDE_INSTALL_DIR "include/${projectNameLower}-${PLAYER_MAJOR_VERSION}.${PLAYER_MINOR_VERSION}") -IF (PLAYER_PROC_64BIT) - SET (PLAYER_LIBRARY_INSTALL_DIR "lib64") - MESSAGE (STATUS "Player libraries will be in lib64") -ELSE (PLAYER_PROC_64BIT) - SET (PLAYER_LIBRARY_INSTALL_DIR "lib") - MESSAGE (STATUS "Player libraries will be in lib") -ENDIF (PLAYER_PROC_64BIT) - +# debian always puts the libraries in lib +SET (PLAYER_LIBRARY_INSTALL_DIR "lib") +MESSAGE (STATUS "Player libraries will be in lib") debian/patches/0007-Use-libv4l1-videodev-compatibility.patch0000644000000000000000000000664012234157477020725 0ustar From: Michael Janssen Date: Tue, 6 Dec 2011 16:23:02 -0600 Subject: Use libv4l1 videodev compatibility. --- server/drivers/camera/sphere/CMakeLists.txt | 2 +- server/drivers/camera/sphere/setpwc_api.h | 2 +- server/drivers/camera/v4l/CMakeLists.txt | 2 +- server/drivers/camera/v4l/camerav4l.cc | 2 +- server/drivers/camera/v4l/v4lcapture.h | 2 +- server/drivers/camera/v4l/v4lframe.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/drivers/camera/sphere/CMakeLists.txt b/server/drivers/camera/sphere/CMakeLists.txt index 6e803e6..ddf9f37 100644 --- a/server/drivers/camera/sphere/CMakeLists.txt +++ b/server/drivers/camera/sphere/CMakeLists.txt @@ -1,6 +1,6 @@ PLAYERDRIVER_OPTION (sphere build_sphere ON) PLAYERDRIVER_REJECT_OS (sphere build_sphere PLAYER_OS_WIN) -PLAYERDRIVER_REQUIRE_HEADER (sphere build_sphere linux/videodev.h sys/types.h) +PLAYERDRIVER_REQUIRE_HEADER (sphere build_sphere libv4l1-videodev.h sys/types.h) PLAYERDRIVER_ADD_DRIVER (sphere build_sphere CFLAGS "-I${PROJECT_SOURCE_DIR}/server/drivers/camera/v4l" SOURCES sphere_mixed.cc setpwc_api.c) diff --git a/server/drivers/camera/sphere/setpwc_api.h b/server/drivers/camera/sphere/setpwc_api.h index a671280..ad6ca48 100644 --- a/server/drivers/camera/sphere/setpwc_api.h +++ b/server/drivers/camera/sphere/setpwc_api.h @@ -26,7 +26,7 @@ #include #include #define _LINUX_TIME_H 1 /* to get things compile on kernel 2.6.x */ -#include +#include #include "pwc-ioctl.h" diff --git a/server/drivers/camera/v4l/CMakeLists.txt b/server/drivers/camera/v4l/CMakeLists.txt index da7fe9a..cd4572e 100644 --- a/server/drivers/camera/v4l/CMakeLists.txt +++ b/server/drivers/camera/v4l/CMakeLists.txt @@ -1,4 +1,4 @@ PLAYERDRIVER_OPTION (camerav4l build_camerav4l ON) PLAYERDRIVER_REJECT_OS (camerav4l build_camerav4l PLAYER_OS_WIN) -PLAYERDRIVER_REQUIRE_HEADER (camerav4l build_camerav4l linux/videodev.h sys/types.h) +PLAYERDRIVER_REQUIRE_HEADER (camerav4l build_camerav4l libv4l1-videodev.h sys/types.h) PLAYERDRIVER_ADD_DRIVER (camerav4l build_camerav4l SOURCES camerav4l.cc v4lcapture.c v4lframe.c ccvt_c1.c) diff --git a/server/drivers/camera/v4l/camerav4l.cc b/server/drivers/camera/v4l/camerav4l.cc index c359fd6..8a45a50 100644 --- a/server/drivers/camera/v4l/camerav4l.cc +++ b/server/drivers/camera/v4l/camerav4l.cc @@ -37,7 +37,7 @@ below for notes on specific camera/frame grabber combinations. @par Compile-time dependencies - <sys/types.h> -- <linux/videodev.h> +- <libv4l1-videodev.h> @par Provides diff --git a/server/drivers/camera/v4l/v4lcapture.h b/server/drivers/camera/v4l/v4lcapture.h index 02c13d8..d58b064 100644 --- a/server/drivers/camera/v4l/v4lcapture.h +++ b/server/drivers/camera/v4l/v4lcapture.h @@ -58,7 +58,7 @@ extern "C" #include #endif #include -#include +#include #include "v4lframe.h" diff --git a/server/drivers/camera/v4l/v4lframe.c b/server/drivers/camera/v4l/v4lframe.c index acefb37..fc5c4a3 100644 --- a/server/drivers/camera/v4l/v4lframe.c +++ b/server/drivers/camera/v4l/v4lframe.c @@ -40,7 +40,7 @@ #include #include -#include +#include //-------------------------------------------------------------------------- debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch0000644000000000000000000000324112312611135016702 0ustar Description: Fix for API changes of libstatgrab version 0.90 Author: Peter Michael Green Bug-Debian: http://bugs.debian.org/735572 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- player-3.0.2+dfsg.orig/server/drivers/health/statgrab/statgrab_health.cpp +++ player-3.0.2+dfsg/server/drivers/health/statgrab/statgrab_health.cpp @@ -130,7 +130,7 @@ StatGrabDriver::StatGrabDriver(ConfigFil int StatGrabDriver::MainSetup() { // Initialise statgrab - sg_init(); + sg_init(1); /* Drop setuid/setgid privileges. */ if (sg_drop_privileges() != 0) { @@ -171,7 +171,7 @@ void StatGrabDriver::RefreshData() //double receivedCpu; float cpuIdle, cpuServer, cpuUser ; //CPU - cpu_percent = sg_get_cpu_percents(); + cpu_percent = sg_get_cpu_percents(NULL); cpuIdle = cpu_percent->idle; mHealth.cpu_usage.idle = cpuIdle; @@ -183,8 +183,8 @@ void StatGrabDriver::RefreshData() //Virtual Memory - mem_data = sg_get_mem_stats(); - swap_stats = sg_get_swap_stats(); + mem_data = sg_get_mem_stats(NULL); + swap_stats = sg_get_swap_stats(NULL); mHealth.mem.total = mem_data->total; mHealth.mem.used = mem_data->used; debian/patches/0009-Fix-zlib-1.2.6-FTBFS.patch0000644000000000000000000000210312234157477015224 0ustar From: Michael Janssen Date: Mon, 19 Mar 2012 17:58:32 -0500 Subject: Fix zlib 1.2.6 FTBFS --- server/drivers/shell/readlog.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/drivers/shell/readlog.cc b/server/drivers/shell/readlog.cc index 7cf59c3..29d1dcf 100644 --- a/server/drivers/shell/readlog.cc +++ b/server/drivers/shell/readlog.cc @@ -665,7 +665,7 @@ void ReadLog::Main() // back up to the beginning of the file #if HAVE_Z if (this->gzfile) - ret = gzseek(this->file,0,SEEK_SET); + ret = gzseek((gzFile)this->file,0,SEEK_SET); else ret = fseek(this->file,0,SEEK_SET); #else @@ -711,7 +711,7 @@ void ReadLog::Main() // compared to fgets (on uncompressed files), so use the latter. #if HAVE_Z if (this->gzfile) - ret = (gzgets(this->file, this->line, this->line_size) == NULL); + ret = (gzgets((gzFile)this->file, this->line, this->line_size) == NULL); else ret = (fgets(this->line, this->line_size, (FILE*) this->file) == NULL); #else debian/patches/0003-Fix-FTBS-on-mips-and-mipsel.patch0000644000000000000000000000202512234157477017122 0ustar From: Michael Janssen Date: Sat, 4 Dec 2010 02:30:06 -0600 Subject: Fix FTBS on mips and mipsel Fix FTBS on mips and mipsel by removing zero initializer from 'struct sigaction' variables. 'struct sigaction' is defined different on mips and mipsel and the variables are set directly after declaration anyway. Patch contributed by Daniel Hess --- server/server.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/server.cc b/server/server.cc index b2ecced..847c74b 100644 --- a/server/server.cc +++ b/server/server.cc @@ -148,11 +148,11 @@ main(int argc, char** argv) exit(-1); } #else - struct sigaction quit_action = {{0}}; + struct sigaction quit_action; quit_action.sa_handler = Quit; sigemptyset (&quit_action.sa_mask); quit_action.sa_flags = SA_RESETHAND; - struct sigaction ignore_action = {{0}}; + struct sigaction ignore_action; ignore_action.sa_handler = SIG_IGN; sigemptyset (&ignore_action.sa_mask); if(sigaction(SIGINT, &quit_action, NULL) != 0) debian/patches/link-asound.patch0000644000000000000000000000154512234170007014063 0ustar Description: link asound Author: Dmitrijs Ledkovs --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -51,6 +51,7 @@ IF (PLAYER_DRIVERSLIB_LINKFLAGS) TARGET_LINK_LIBRARIES (player ${PLAYER_DRIVERSLIB_LINKFLAGS}) ENDIF (PLAYER_DRIVERSLIB_LINKFLAGS) +TARGET_LINK_LIBRARIES (player asound) INSTALL (TARGETS player DESTINATION bin/ COMPONENT applications) # Clean up stuff from the drivers --- a/server/libplayerdrivers/CMakeLists.txt +++ b/server/libplayerdrivers/CMakeLists.txt @@ -124,7 +124,7 @@ # Set the link flags for the library appropriately IF (PLAYER_DRIVERSLIB_LINKFLAGS) SET_TARGET_PROPERTIES(playerdrivers PROPERTIES - LINK_FLAGS ${PLAYER_DRIVERSLIB_LINKFLAGS}) + LINK_FLAGS "${PLAYER_DRIVERSLIB_LINKFLAGS} -lasound") ENDIF (PLAYER_DRIVERSLIB_LINKFLAGS) # Package config file for libplayerdrivers debian/patches/0006-Add-debian-plugins-directory.patch0000644000000000000000000000201712234157477017626 0ustar From: Michael Janssen Date: Wed, 15 Dec 2010 18:04:21 -0600 Subject: Add debian plugins directory --- libplayercore/plugins.cc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libplayercore/plugins.cc b/libplayercore/plugins.cc index e6bf23e..00d0762 100644 --- a/libplayercore/plugins.cc +++ b/libplayercore/plugins.cc @@ -129,6 +129,13 @@ LoadPlugin(const char* pluginname, const char* cfgfile) strncat( installdir, "/lib/", PATH_MAX); if( lt_dladdsearchdir( installdir ) ) PLAYER_ERROR1( "failed to add working directory %s to the plugin path", installdir ); + + // add $PLAYER_INSTALL_PREFIX/lib/robot-player + char pluginsdir[ PATH_MAX ]; + strncpy( installdir, PLAYER_INSTALL_PREFIX, PATH_MAX); + strncat( installdir, "/lib/robot-player", PATH_MAX); + if( lt_dladdsearchdir( installdir ) ) + PLAYER_ERROR1( "failed to add debian plugins directory %s to the plugin path", installdir ); } PLAYER_MSG1(3, "loading plugin %s", pluginname); debian/bin/0000755000000000000000000000000012234172636007744 5ustar debian/bin/cleanup-sources.sh0000755000000000000000000000130612234157477013421 0ustar #! /bin/sh # $0 --upstream-version # Based on "debian/bin/uscan_repack.sh" of the enblend-enfuse package. # Ā© 2007, Sebastian Harl and licensed under the GPL. # Modified for player by Daniel Hess in # 2010. # Modified to cleanup a unpacked source tree in 2010 by # Michael Janssen echo set -ex # Remove Sun RPC code because of old license for i in xdr.c xdr_array.c xdr_float.c xdr_intXX_t.c xdr_mem.c xdr_sizeof.c; do rm -rf "replace/$i" done rm -rf "replace/rpc" # Remove because of missing licence informations rm -rf "replace/gettimeofday.c" for patch in debian/patches-dfsg/*.patch; do patch -p1 < $patch done debian/playerxdrgen.10000644000000000000000000000314012234157477011766 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH playerxdrgen "1" "May 2009" "Player" .SH NAME playerxdrgen \- automatically generate libplayerxdr functions .SH SYNOPSIS .B playerxdrgen .RI [-distro] " " " " [] " " " " .SH DESCRIPTION .B playerxdrgen will parse the header foo.h and define in foopack.c functions that (de)marshall all the structures found in foo.h. Prototypes for these functions will be written into foopack.h. You could then compile foopack.c into libfoopack.a; any application needing to encode or decode the messages defined in foo.h would include and link to libfoopack.a. .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/libpmap3.0-dev.install0000644000000000000000000000025312234157477013213 0ustar usr/lib/libpmap.so usr/include/player-3.0/libpmap/omap.h usr/include/player-3.0/libpmap/pmap.h usr/include/player-3.0/libpmap/rmap.h usr/include/player-3.0/libpmap/slap.h debian/libpmap3.0.install0000644000000000000000000000002512234157477012434 0ustar usr/lib/libpmap.so.* debian/dirs0000644000000000000000000000001012234157477010055 0ustar usr/bin debian/libplayerc++3.0-dev.install0000644000000000000000000000023112234157477014037 0ustar usr/lib/libplayerc++.so usr/include/player-3.0/libplayerc++ usr/lib/pkgconfig/playerc++.pc usr/share/cmake/Modules/UsePlayerC++.cmake usr/lib/player-3.0 debian/control0000644000000000000000000005302312235612050010570 0ustar Source: player Section: science Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Michael Janssen Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgsl0-dev, libcv-dev, libhighgui-dev, libcvaux-dev, libgtk2.0-dev, libdc1394-22-dev, libboost-signals-dev, libboost-thread-dev, libboost-system-dev, swig, libjpeg-dev, doxygen, linux-libc-dev | linux-kernel-headers, libgnomecanvas2-dev, freeglut3-dev, graphviz, libtheora-dev, libgeos-dev, libpqxx3-dev, libxmu-dev, libcvaux-dev, libasound2-dev, libstatgrab-dev, cmake, libusb-dev, libv4l-dev, libopencv-dev XS-Python-Version: all Standards-Version: 3.9.3 Homepage: http://playerstage.sourceforge.net/ Package: robot-player Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . Player supports a wide variety of mobile robots and accessories. Package: robot-player-doc Section: doc Architecture: all Depends: ${misc:Depends} Description: Networked server for robots and sensors (documentation) Player provides a common interface to a variety of robot and sensor hardware. The client/server model allows robot programs to be written in many programming languages. This package provides the Doxygen documentation for robot-player, libplayercore, libplayerc++, libplayerc, libplayerdrivers, libplayercommon, libplayertcp, libplayerinterface, libplayerwkb, and libplayerudp. Package: robot-player-dev Architecture: all Depends: libplayertcp3.0-dev (>= ${source:Version}), libplayerc++3.0-dev (>= ${source:Version}), libplayerdrivers3.0-dev (>= ${source:Version}), libplayerwkb3.0-dev (>= ${source:Version}), ${misc:Depends} Description: Networked server for robots and sensors - development package Player proovides a common interface to a variety of robot and} sensor hardware. The client/server model allows robot programs to be written in many programming languages. This metapackage provides an easy way to install all the development libraries at once by depending on them. Package: libplayercommon3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - common functions Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains shared functions for log and error handling. Package: libplayercommon3.0-dev Provides: libplayercommon-dev Conflicts: libplayercommon-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayercommon3.0 (= ${binary:Version}) Description: Networked server for robots and sensors - error handling development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for error handling. Package: libplayercore3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - core library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the shared library bridging the gap between the devices supported by Player and the interfaces which are defined, including the messages and queues in which messages are stored. Package: libplayercore3.0-dev Provides: libplayercore-dev, libplayercore2-dev Conflicts: libplayercore-dev, libplayercore2-dev Replaces: libplayercore2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayercore3.0 (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}), libplayerinterface3.0-dev (= ${binary:Version}), libgeos-dev Description: Networked server for robots and sensors - core library development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for utilizing the library bridging the gap between the devices supported by Player and the interfaces which are defined, including the messages and queues in which messages are stored. Package: libplayertcp3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - tcp library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the library which moves messages from Player message queues to the TCP socket, and vice-versa. Package: libplayertcp3.0-dev Provides: libplayertcp-dev, libplayertcp2-dev, libplayerudp-dev, libplayerudp2-dev Conflicts: libplayertcp-dev, libplayertcp2-dev, libplayerudp-dev, libplayerudp2-dev Replaces: libplayertcp2-dev, libplayerudp2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayertcp3.0 (= ${binary:Version}), libplayercore3.0-dev (= ${binary:Version}), libplayerinterface3.0-dev (= ${binary:Version}) Description: Networked server for robots and sensors - tcp library development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for using the library which moves messages from Player message queues to the TCP socket, and vice-versa. Package: libplayerc3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - C client library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the C library for interface to Player servers. Package: libplayerc3.0-dev Provides: libplayerc-dev, libplayerc2-dev Conflicts: libplayerc-dev, libplayerc2-dev Replaces: libplayerc2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc3.0 (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}) Description: Networked server for robots and sensors - C client library development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the files required to utilize the C client library Package: libplayerc++3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - C++ client library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the C++ library for interface to Player servers. Package: libplayerc++3.0-dev Provides: libplayerc++-dev, libplayerc++2-dev Conflicts: libplayerc++-dev, libplayerc++2-dev Replaces: libplayerc++2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerc++3.0 (= ${binary:Version}), libplayerc3.0-dev (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}), libboost-thread-dev, libboost-signals-dev Description: Networked server for robots and sensors - C++ client library development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the files required to utilize the C++ client library Package: libplayerdrivers3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - hardware drivers library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains drivers required to run hardware available through the Player server. Package: libplayerdrivers3.0-dev Provides: libplayerdrivers-dev, libplayerdrivers2-dev Conflicts: libplayerdrivers-dev, libplayerdrivers2-dev Replaces: libplayerdrivers2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerdrivers3.0 (= ${binary:Version}), libplayercore3.0-dev (= ${binary:Version}), libplayerjpeg3.0-dev (= ${binary:Version}), libplayerinterface3.0-dev (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}), libplayerwkb3.0-dev (= ${binary:Version}), libcv-dev, libcvaux-dev, libgsl0-dev, libdc1394-22-dev | libdc1394-dev, libhighgui-dev Description: Networked server for robots and sensors - hardware drivers development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files required to interface new hardware to the Player server. Package: libplayerjpeg3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - jpeg library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains utility functions for handling jpeg compression. Package: libplayerjpeg3.0-dev Provides: libplayerjpeg-dev, libplayerjpeg2-dev Conflicts: libplayerjpeg-dev, libplayerjpeg2-dev Replaces: libplayerjpeg2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerjpeg3.0 (= ${binary:Version}), libjpeg-dev Description: Networked server for robots and sensors - jpeg library development files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for the utility functions handling jpeg compression. Package: libpmap3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - particle-based mapping library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains libpmap, a library which uses a particle-filter based method to determine possible maps of a scene. Package: libpmap3.0-dev Provides: libpmap-dev, libpmap0-dev Conflicts: libpmap-dev, libpmap0-dev Replaces: libpmap0-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libpmap3.0 (= ${binary:Version}) Description: Networked server for robots and sensors - particle library dev files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for libpmap, a library for using a particle-filter based method for mapping a 2D scene. Package: liblodo3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - laser-based odometry library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains liblodo, which uses an incremental SLAM algorithm to produce odometry poses with drift which is much better than odometry alone. Package: liblodo3.0-dev Provides: liblodo-dev, liblodo0-dev Conflicts: liblodo-dev, liblodo0-dev Replaces: liblodo0-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, liblodo3.0 (= ${binary:Version}) Description: Networked server for robots and sensors - laser odometry dev files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for liblodo, a library for using SLAM to produce odometry which is superior to odometry alone. Package: libplayerinterface3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - interface library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the library for packing and unpacking player interface structures using the XDR representation. Package: libplayerinterface3.0-dev Provides: libplayerxdr-dev, libplayerxdr2-dev Conflicts: libplayerxdr-dev, libplayerxdr2-dev Replaces: libplayerxdr2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerinterface3.0 (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}), python Description: Networked server for robots and sensors - interface library dev files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for libplayerinterface, a library for packing and unpacking interface structures using the XDR representation. Package: libplayerwkb3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - WKB library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the library for encoding and decoding the Well-Known Binary (WKB) format for geometric primitives. Package: libplayerwkb3.0-dev Provides: libplayerwkb-dev Conflicts: libplayerwkb-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libplayerwkb3.0 (= ${binary:Version}), libplayercommon3.0-dev (= ${binary:Version}) Description: Networked server for robots and sensors - WKB library dev files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for libplayerwkb, a library for encoding and decoding the Well-Known Binary (WKB) format for geometric primitives. Package: libwavefront-standalone3.0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Networked server for robots and sensors - standalone wavefront library Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the standalone wavefront drivers usable outside of the player framework. Package: libwavefront-standalone3.0-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libwavefront-standalone3.0 (= ${binary:Version}) Description: Networked server for robots and sensors - standalone wavefront dev files Provides a network interface to a variety of robot and sensor hardware. Player's client/server model allows robot control programs to be written in any programming language and to run on any computer with a network connection to the robot. Player supports multiple concurrent client connections to devices, creating new possibilities for distributed and collaborative sensing and control. . This package contains the development files for the standalone wavefront drivers usable outside of the player framework. debian/libplayerwkb3.0.install0000644000000000000000000000003212234157477013475 0ustar usr/lib/libplayerwkb.so.* debian/robot-playerjoy.10000644000000000000000000000433712234157477012434 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playerjoy "1" "May 2009" "Player" .SH NAME robot-playerjoy \- console-based client for teleoperation .SH SYNOPSIS .B robot-playerjoy .RI [options] " " " " [] .SH DESCRIPTION .B robot-playerjoy is a console-based client that provides planar, differential-drive teleoperation of position2d and position3d devices. In other words, robot-playerjoy allows you to manually drive your (physical or simulated) robot around. robot-playerjoy uses velocity control, and so will only work when the underlying driver supports velocity control (most drivers do). .SH OPTIONS .TP .B -v verbose mode. Print the Player device state on stdout. .TP .B -3d connect to position3d interface (instead of position). .TP .B -c continuously send commands. .TP .B -n don't send commands or enable motors (for debugging). .TP .B -k use keyboard control (instead of joystick device). .TP .B -p print out speeds on the console. .TP .B -udp use UDP instead of TCP (deprecated, currently disabled). .TP .BI "-speed " speed maximum linear speed in meter per second (default: 0.5). .TP .BI "-turnspeed " speed maximum angular speed in degrees per second (default: 60). .TP .BI "-dev " device joystick device file the joystick is connected to (default: /dev/js0). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/ruby-playerc.install0000644000000000000000000000002212234157477013202 0ustar usr/lib/site_ruby debian/robot-playerv.10000644000000000000000000000325412234157477012075 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-playerv "1" "May 2009" "Player" .SH NAME robot-playerv \- GUI client program to visualizes sensor data .SH SYNOPSIS .B robot-playerv .RI [options] .SH DESCRIPTION .B robot-playerv is a GUI client program that visualizes sensor data from a player server. It also provides some teleoperation capabilities. .SH OPTIONS .TP .BI "\-h " host connect to Player on this .I host (default: localhost). .TP .BI "\-p " port connect to Player on this TCP .I port (default: 6665). .TP .BI "\-rate " rate request data update at .I rate in Hz (default: 5Hz). .TP .B \-\-: .I device and .I index of the device to be visualized (e.g. \-\-position:0 or \-\-sonar:0). .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. .BR robot-playerprint (1) debian/README.Debian0000644000000000000000000000217412234157477011247 0ustar player for Debian ================= Player has been renamed to robot-player in Debian as well as a number of key utilities, as their names were considered too generic. - player => robot-player - playerv => robot-playerv - playercam => robot-playercam - playerjoy => robot-playerjoy - playernav => robot-playernav - playerprint => robot-playerprint - playervcr => robot-playervcr - playerwritemap => robot-playerwritemap - pmaptest => robot-pmaptest Libraries were split out to separate packages, but not renamed. All libraries and dev packages (needed for compiling player programs) can be installed with the robot-player-dev package. Player programs should compile with no change to build systems. The documentation for the API and programs is located in the robot-player-doc package. The examples which are normally compiled with the player source are not included in binary form in the Debian package, but the source is still available in /usr/share/player/examples. -- Michael Janssen Tue, 2 June 2009 21:39:10 -0600 debian/libplayercommon3.0-dev.install0000644000000000000000000000030712234157477014763 0ustar usr/include/player-3.0/playerconfig.h usr/include/player-3.0/libplayercommon usr/lib/libplayercommon.so usr/lib/pkgconfig/playercommon.pc usr/share/cmake/Modules/PlayerUtils.cmake usr/lib/player-3.0 debian/libplayertcp3.0.install0000644000000000000000000000006412234157477013505 0ustar usr/lib/libplayertcp.so.* usr/lib/libplayerudp.so.* debian/robot-player.10000644000000000000000000000312612234157477011705 0ustar .\" Copyright (C) 2009 Daniel Hess .\" .\" This is free software; you may redistribute it and/or modify .\" it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2, .\" or any later version. .\" .\" This is distributed in the hope that it will be useful, but .\" WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with this; if not write to the Free Software Foundation, Inc. .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .TH robot-player "1" "May 2009" "Player" .SH NAME robot-player \- robot device interface server .SH SYNOPSIS .B robot-player .RI [options] " " [] .SH DESCRIPTION .B robot-player is the server program in the Player robot device interface framework. With robot-player running on the Robot local and remote programs can access the robots hardware. .SH OPTIONS .TP .B -h Output a brief help message. .TP .BI "-d " level debug message .I level (0 = none, 1 = default, 9 = all). .TP .BI "-p " port port where Player will listen. Default: 6665 .TP .B -q quiet mode: minimizes the console output on startup. .SH AUTHOR .B Player was written by Brian Gerkey and contributors. This manual page was written by Daniel Hess for the Debian Project. .SH SEE ALSO The HTML documentation in .BR /usr/share/doc/player/html of the .BR robot-player-doc package. debian/libplayerinterface3.0-dev.manpages0000644000000000000000000000006212234157477015556 0ustar debian/playerxdrgen.1 debian/playerinterfacegen.1 debian/libplayerc3.0-dev.install0000644000000000000000000000022112234157477013710 0ustar usr/lib/libplayerc.so usr/include/player-3.0/libplayerc usr/lib/pkgconfig/playerc.pc usr/share/cmake/Modules/UsePlayerC.cmake usr/lib/player-3.0 debian/robot-player-doc.install0000644000000000000000000000006412234157477013754 0ustar usr/share/doc/player/html usr/share/player/examples debian/libplayerjpeg3.0.install0000644000000000000000000000003312234157477013640 0ustar usr/lib/libplayerjpeg.so.* debian/liblodo3.0.install0000644000000000000000000000002512234157477012434 0ustar usr/lib/liblodo.so.* debian/changelog0000644000000000000000000001772412312610752011052 0ustar player (3.0.2+dfsg-4.1ubuntu3) trusty; urgency=medium * Fix for API changes of libstatgrab version 0.90, patch taken from Debian issue #735572. -- Matthias Klose Thu, 20 Mar 2014 16:51:29 +0100 player (3.0.2+dfsg-4.1ubuntu2) trusty; urgency=low * Disable python and ruby plugins: - FTBFS against swig2.0 - At least python, were broken anyway failed to import (Closes: #723872) -- Dmitrijs Ledkovs Mon, 04 Nov 2013 03:25:47 +0000 player (3.0.2+dfsg-4.1ubuntu1) trusty; urgency=low * Merge from Debian, remaining changes: - Fix bogus assertion that cause playercam to crash. - Add patch to fix ftbfs due to invalid cast to pointer. - Include architecture.mk in the debian/rules to fix ftbfs, when debian/rules is invoked directly. - unresolved-symbols-so.diff: link libplayerdrivers.so with -lpq to resolve symbols in shared library (Closes: #607221) * Drop changes, superseeded in debian: - boost1.53.patch, superseeded by debian's boost1.54 patch. * New changes: - build-depend on libopencv-dev (LP: #1240608) - properly link libasound. -- Dmitrijs Ledkovs Wed, 30 Oct 2013 10:32:05 +0000 player (3.0.2+dfsg-4.1) unstable; urgency=low * Non-maintainer upload. * Add patches/boost1.54. Fix FTBFS with boost 1.54. (Closes: #710628, #721892) -- Nobuhiro Iwamatsu Fri, 06 Sep 2013 15:11:00 +0900 player (3.0.2+dfsg-4ubuntu4) saucy; urgency=low * Use boost::TIME_UTC_ fixes FTBFS with boost1.53. * Link against boost_system. -- Dmitrijs Ledkovs Fri, 24 May 2013 14:18:05 +0100 player (3.0.2+dfsg-4ubuntu3) raring; urgency=low * Fix bogus assertion that cause playercam to crash. (LP: #979841) -- Stefan Herbrechtsmeier Fri, 11 Jan 2013 13:24:36 +0100 player (3.0.2+dfsg-4ubuntu2) quantal; urgency=low * Add patch to fix ftbfs due to invalid cast to pointer (LP: #1019087) * Include architecture.mk in the debian/rules to fix ftbfs, when debian/rules is invoked directly. -- Dmitrijs Ledkovs Wed, 08 Aug 2012 12:06:17 +0100 player (3.0.2+dfsg-4ubuntu1) quantal; urgency=low * Merge from Debian unstable, remaining changes: - unresolved-symbols-so.diff: link libplayerdrivers.so with -lpq to resolve symbols in shared library (Closes: #607221) -- Dmitrijs Ledkovs Thu, 28 Jun 2012 02:16:11 +0100 player (3.0.2+dfsg-4) unstable; urgency=low * Patch for zlib 1.2.6 compatibility (FTBFS). * Patch for libgeos changes. Closes: #662593 * Bump Standards-Version to 3.9.3 (no changes) -- Michael Janssen Sun, 25 Mar 2012 18:06:18 -0500 player (3.0.2+dfsg-3ubuntu2) precise; urgency=low * Rebuild for opencv 2.3 transition -- Adrien Cunin Mon, 13 Feb 2012 23:30:25 +0100 player (3.0.2+dfsg-3ubuntu1) precise; urgency=low * Reinstate patch from version 3.0.1+dfsg-1.1ubuntu5 to fix FTBFS: - unresolved-symbols-so.diff: link libplayerdrivers.so with -lpq to resolve symbols in shared library -- Ilya Barygin Sat, 24 Dec 2011 10:29:37 +0400 player (3.0.2+dfsg-3) unstable; urgency=low * Ack NMU. * Fix typo in package description. Closes: #618845 * Remove build-dependency on libmagick++-dev because player doesn't use imagemagick anymore. Closes: #625579 * Upgrade to libpqxx3. Closes: #623082 * Enable a couple more drivers for old cameras (Adds build-dep: libv4l-dev) * Add build-dep: libusb-dev to build more drivers * Fix spelling error in robot-playerjoy manpage * Bump Standard-Version to 3.9.2 (no changes) -- Michael Janssen Tue, 06 Dec 2011 16:48:10 -0600 player (3.0.2+dfsg-2.1build1) precise; urgency=low * No change rebuild for imagemagick4 transition -- Michael Terry Fri, 18 Nov 2011 11:16:56 -0500 player (3.0.2+dfsg-2.1) unstable; urgency=low * Non-maintainer upload. * Build-depend on python-support rather than (unused) python-central (closes: #614614). -- Jakub Wilk Sat, 05 Mar 2011 14:12:35 +0100 player (3.0.2+dfsg-2) unstable; urgency=low * Add /usr/lib/robot-player to the places searched for plugins to play nice with stage-player-plugin which installs the stage plugin there. -- Michael Janssen Wed, 15 Dec 2010 18:06:53 -0600 player (3.0.2+dfsg-1) unstable; urgency=low * Remove libphidgets support since it is removed from Debian. (Closes: #584363) * Redo patch for clarity. * Ack NMU (thanks Christoph). * New upload forces us to recompile against an existent libcv. (Closes: #598002) * Bump Standards-Version to 3.9.1 (no changes to comply). * New upstream version. * Include patches for FTBFS for arm{,el}, alpha, mips{,el}, ia64. (thanks Daniel Hess) (Closes: #584232) * Don't install the binaries for the examples. (Closes: #554179) * Raise exceptions correctly in player{interface,xdr}gen (Closes: #585241) -- Michael Janssen Sat, 04 Dec 2010 02:42:06 -0600 player (3.0.1+dfsg-1.2) unstable; urgency=low * Non-maintainer upload. * Fix FTBS on armel, alpha and ia64 by using non-paused port io operations instead of the ā€œ_pā€ onces not defined on this architectures (fix-portio.patch). * Fix FTBS on mips and mipsel by removing zero initializer from 'struct sigaction' variables. 'struct sigaction' is defined different on mips and mipsel and the variables are set directly after declaration anyway. -- Daniel Hess Wed, 02 Jun 2010 11:45:35 +0200 player (3.0.1+dfsg-1.1) unstable; urgency=low * Non-maintainer upload. * Add cmake build-dependency (Closes: #578785) -- Christoph Egger Sat, 22 May 2010 11:46:13 +0200 player (3.0.1+dfsg-1) unstable; urgency=low * New upstream version. Closes: #528653, #487395. - Clean up sources to remove files that we aren't using in Debian and are not DFSG, and unlabeled ones we also aren't using * Ack patch from Daniel Hess. Closes: #494713 - Fix typo in package description. - Add man pages for installed binaries - Stronger dependencies betwen libplayer*-dev and libplayer* * Standards-Version to 3.8.4: No changes needed * Add and remove packages for new and removed / renamed libraries -- Michael Janssen Tue, 30 Mar 2010 18:41:22 -0500 player (2.1.2-1) unstable; urgency=low * New upstream version. Closes: #528653, #487395. * Ack patches from Daniel Hess - changes are incorporaed. Closes: #494713. - Update package names in Build-Depends. - Fix typo in package description. - Add man pages for installed binaries. - Tighten depends between libplayer*-dev and libplayer* packages by including exact version. - Reflect changes to *.pc files in the corresponding libplayer*-dev packages. * Add packages for libplayerutils2, libplayerutils2-dev, libplayerudp2, libplayerudp2-dev. * Use dpatch. * Standards-Version to 3.8.1. -- Michael Janssen Tue, 02 Jun 2009 22:06:37 -0500 player (2.0.4-4) unstable; urgency=low * Fix #includes for GCC 4.3. Closes: #456063. * Standards-Version bump to 3.7.3 -- Michael Janssen Thu, 28 Feb 2008 12:11:03 -0600 player (2.0.4-3) unstable; urgency=low * Add player-pmaptest to the set of utilities installed. (closes: #444257) * Stop working around python-central bugs that are fixed. (closes: #432740) * Move Homepage to real field in control file. -- Michael Janssen Tue, 27 Nov 2007 00:12:14 -0600 player (2.0.4-2) unstable; urgency=low * Depends update in order to depend on libgsl0dbl. -- Michael Janssen Mon, 20 Aug 2007 21:40:08 -0500 player (2.0.4-1) unstable; urgency=low * Initial release. Closes: #282022. -- Michael Janssen Thu, 17 May 2007 01:46:48 -0500 debian/libwavefront-standalone3.0.install0000644000000000000000000000004512234157477015642 0ustar usr/lib/libwavefront_standalone.so.* debian/libplayerc++3.0.install0000644000000000000000000000003212234157477013262 0ustar usr/lib/libplayerc++.so.* debian/libplayercore3.0-dev.install0000644000000000000000000000013612234157477014423 0ustar usr/lib/libplayercore.so usr/include/player-3.0/libplayercore usr/lib/pkgconfig/playercore.pc debian/libplayercommon3.0.install0000644000000000000000000000003512234157477014205 0ustar usr/lib/libplayercommon.so.* debian/libplayercore3.0.install0000644000000000000000000000003312234157477013643 0ustar usr/lib/libplayercore.so.* debian/libplayerinterface3.0-dev.install0000644000000000000000000000033612234157477015435 0ustar usr/lib/libplayerinterface.so usr/lib/pkgconfig/playerinterface.pc usr/share/cmake/Modules/UsePlayerPlugin.cmake usr/lib/player-3.0 usr/include/player-3.0/libplayerinterface usr/bin/playerxdrgen usr/bin/playerinterfacegen