Skip to content

Commit

Permalink
Merge branch 'master' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
pattacini committed Jul 24, 2018
2 parents a281d47 + 769a228 commit 1de1b5b
Show file tree
Hide file tree
Showing 26 changed files with 946 additions and 458 deletions.
243 changes: 78 additions & 165 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,77 @@ Unless otherwise stated, files in YARP are:
This software may be modified and distributed under the terms of the
BSD-3-Clause license. See the accompanying LICENSE file for details.

Most YARP components are released under the terms of the BSD-3-Clause.
Some optional components are released under the terms of the LGPL-2.1 or later,
GPL-2.0 or later, GPL-3.0 or later, or Apache-2.0 License:
* Some components are released under the terms of the LGPL license, version 2.1
or later.
+ devices:
- `batteryClient`
- `batteryWrapper`
- `depthCamera`
- `imuBosch_BNO055`
- `laserFromDepth`
- `laserHokuyo`
- `localization2DClient`
- `map2DClient`
- `map2DServer`
- `navigation2DClient`
- `opencv`
- `ovrheadset`
- `portaudio`
- `Rangefinder2DClient`
- `Rangefinder2DWrapper`
- `rpLidar`
- `rpLidar2`
- `SDLJoypad`
- `transformClient`
- `transformServer`
+ tools:
- `yarplogger-console`
- `yarpmanager-console`
- `yarprobotinterface`
+ GUIs:
- `yarpbatterygui`
- `yarpdataplayer`
- `yarplaserscannergui`
- `yarplogger`
- `yarpmanager`
- `yarpmotorgui`
- `QtYARPView` and `yarpview`
* Some optional components use 3rd party libraries that may have some extra
requirements.
+ `libYARP_rtf` and the RTF plugins use
[RTF](https://github.com/robotology/robot-testing/blob/master/LICENSE).
+ The `xmlrpc` carrier uses a custom version of the
[xmlrpcpp](https://sourceforge.net/projects/xmlrpcpp/) library.
+ The `bayer` carrier uses alternatively
[libdc1394](http://damien.douxchamps.net/ieee1394/libdc1394/) or, if the
library is not available, links statically a few files taken from
[libdc1394](http://libdc1394.git.sourceforge.net/git/gitweb.cgi?p=libdc1394/libdc1394;a=blob_plain;f=libdc1394/dc1394/bayer.c;hb=HEAD).
+ The `h264` carrier uses glib (LGPLv2.1 or later) and gstreamer (LGPLv2.1 or
later).
+ The `mpi` carrier uses MPI (license dependent on the implementation).
+ The `dynamixelAX12Ftdi` device uses
[libftdi](https://www.intra2net.com/en/developer/libftdi/).
+ The `SDLJoypad` device uses alternatively
[SDL 1.2](https://libsdl.org/license.php).
+ The ffmpeg_grabber and ffmpeg_writer devices use
[Ffmpeg](https://github.com/FFmpeg/FFmpeg/blob/master/LICENSE.md).
+ The ovrheadset device use the
[Oculis SDK](https://developer.oculus.com/licenses/).
* A few optional parts of YARP are released under the terms of the GPL license,
version 2 or later:
+ `libYARP_math` uses the GNU Scientific Library, under the GPL 2 or later.
+ `example/matrix/gsl_example.cpp` uses GSL, under the GPL 2 or later.
* A few optional parts of YARP are released under the terms of the GPL license,
version 3 or later:
+ `QtYARPScope` uses QCustomPlot that is GPL3+ and it is therefore GPL3+.
+ `yarpscope` uses `QtYARPScope` that is GPL3+ and it is therefore GPL3+.
+ `yarpviz` uses qgv that is GPL3+ and it is therefore GPL3+.
+ `example/ContainerExample` uses `QtYARPScope` and it is therefore GPL3+.
* The `yarpidl_thrift` tool is released under the Apache-2.0 License.

The list of committers in the YARP repository (ordered by number of commit) is:
Paul Fitzpatrick
Daniele E. Domenichelli
Expand All @@ -15,9 +86,9 @@ The list of committers in the YARP repository (ordered by number of commit) is:
Ugo Pattacini
Ali Paikan
YARP Developers
Damiano Enerli
Alessandro Scalzo
Andrea Ruzzenenti
Damiano Enerli
Elena Ceseracciu
Silvio Traversaro
Francesco Romano
Expand Down Expand Up @@ -47,10 +118,10 @@ The list of committers in the YARP repository (ordered by number of commit) is:
Giovanni Saponaro
Giulia Vezzani
Jonas Ruesch
Lorenzo Rapetti
Michael Bucko
Massimo Regoli
Alessio Rocchi
Lorenzo Rapetti
Mirko Ferrati
Aiko Dinale
Bertrand Higy
Expand All @@ -76,15 +147,16 @@ The list of committers in the YARP repository (ordered by number of commit) is:
Marco Monforte
Massimiliano Iacono
Matej Hoffmann
Mohamed Babiker Mohamed Elobaid
Pedro Vicente
Serena Ivaldi
Vítor Galvão
Zero King

The list of copyright holders for YARP is:
Copyright (C) 1995, 2000, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
Istituto Italiano di Tecnologia (IIT) (1969 files)
RobotCub Consortium (729 files)
Istituto Italiano di Tecnologia (IIT) (2192 files)
RobotCub Consortium (732 files)
Daniel Krieg <[email protected]> (16 files)
David Miller <[email protected]> (13 files)
David Vignoni <[email protected]> (13 files)
Expand All @@ -93,22 +165,20 @@ The list of copyright holders for YARP is:
Nuno Pinheiro <[email protected]> (13 files)
Riccardo Iaconelli <[email protected]> (13 files)
Anne van Rossum <[email protected]> (11 files)
Giacomo Spigler (11 files)
Arjan Gijsberts (9 files)
Giacomo Spigler (7 files)
Alexandre Bernardino (5 files)
Carlos Beltran-Gonzalez (5 files)
Renaud Detry (5 files)
Digia Plc and/or its subsidiary(-ies) (4 files)
Ze Ji (3 files)
Eric Mislivec (2 files)
Freyr Magnusson (2 files)
Intel Corporation (2 files)
Ze Ji (2 files)
Fabrice Bellard (1 file)
Francesco Giovannini (1 file)
Jonas Ruesch (1 file)
Julio Gomes (1 file)
Open Perception, Inc. (1 file)
The MathWorks, Inc. (1 file)
Willow Garage, Inc. (1 file)

The identifier "RobotCub Consortium" used in some copyright statements is
Expand All @@ -134,160 +204,3 @@ equivalent to the following list of institutions:
Automation - Salford - United Kingdom
* [2009-2010] The University of Sheffield, Dept. of Automatic Control &
Systems Engineering, Sheffield, UK

Certain files are integrated in YARP from other sources with
friendly licenses. Here is a list of these files and a summary of
their copyright. See the individual files for more details.
All files used in the default YARP build are compatible with the
LGPL. Optional modules may require use of YARP under the GPL,
rather than the LGPL.

cmake/FindGraphviz.cmake
Copyright: unknown
CopyPolicy: unknown

example/ContainerExample/qtquick2applicationviewer/qtquick2applicationviewer.cpp
Copyright: unknown
CopyPolicy: unknown

example/ContainerExample/qtquick2applicationviewer/qtquick2applicationviewer.h
Copyright: unknown
CopyPolicy: unknown

CTestConfig.cmake
Copyright: unknown
CopyPolicy: unknown

src/yarpview/src/qtquick2applicationviewer/qtquick2applicationviewer.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpview/src/qtquick2applicationviewer/qtquick2applicationviewer.h
Copyright: unknown
CopyPolicy: unknown

src/libYARP_gsl/include/yarp/gsl/Gsl.h
Copyright: (C) 2006-2018 Istituto Italiano di Tecnologia (IIT)
CopyPolicy: unknown

src/libYARP_gsl/include/yarp/gsl/impl/gsl_structs.h
Copyright: (C) 2006-2018 Istituto Italiano di Tecnologia (IIT)
Copyright: (C) 2006-2010 RobotCub Consortium
CopyPolicy: unknown

src/libYARP_gsl/include/yarp/gsl/api.h
Copyright: (C) 2006-2018 Istituto Italiano di Tecnologia (IIT)
CopyPolicy: unknown

src/libYARP_gsl/src/Gsl.cpp
Copyright: (C) 2006-2018 Istituto Italiano di Tecnologia (IIT)
CopyPolicy: unknown

src/yarpscope/plugin/portreader.h
Copyright: unknown
CopyPolicy: unknown

src/yarpscope/plugin/portreader.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpscope/src/qtquick2applicationviewer/qtquick2applicationviewer.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpscope/src/qtquick2applicationviewer/qtquick2applicationviewer.h
Copyright: unknown
CopyPolicy: unknown

src/devices/ffmpeg/avpreamble.h
Copyright: unknown
CopyPolicy: unknown

src/devices/imuBosch_BNO055/imuBosch_BNO055.h
Copyright: (C) 2016 Istituto Italiano di Tecnologia (IIT)
CopyPolicy: GPLv2

src/devices/imuBosch_BNO055/imuBosch_BNO055.cpp
Copyright: (C) 2016 Istituto Italiano di Tecnologia (IIT)
CopyPolicy: GPLv2

src/devices/depthCamera/depthCameraDriver.cpp
Copyright: unknown
CopyPolicy: unknown

src/carriers/portmonitor_carrier/lua/lua_swig.h
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/informationdialog.h
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/batchqosconfdialog.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/portloggerdialog.h
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/informationdialog.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/batchqosconfdialog.h
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/qosconfigdialog.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/qosconfigdialog.h
Copyright: unknown
CopyPolicy: unknown

src/yarpviz/src/portloggerdialog.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/include/log.h
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/include/loadingwidget.h
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/include/mainwindow.h
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/include/genericinfodlg.h
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/include/aboutdlg.h
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/src/aboutdlg.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/src/main.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/src/mainwindow.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/src/genericinfodlg.cpp
Copyright: unknown
CopyPolicy: unknown

src/yarpdataplayer/src/loadingwidget.cpp
Copyright: unknown
CopyPolicy: unknown

19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,25 @@ GPL-2+
You can find the complete texts of the license at 'LICENSE.GPL-2'


GPL-3+
Copyright (C) 2006-2018 Istituto Italiano di Tecnologia (IIT)

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 3 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, see <https://www.gnu.org/licenses/>.

You can find the complete texts of the license at 'LICENSE.GPL-3'


Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 1de1b5b

Please sign in to comment.