[Android] Update the licences for the libraries

Edward Wang git at videolan.org
Thu Jun 28 12:27:25 CEST 2012


android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Thu Jun 28 06:26:31 2012 -0400| [4e84eebcef59258cee7fd722fef7429671a7400f] | committer: Edward Wang

Update the licences for the libraries

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=4e84eebcef59258cee7fd722fef7429671a7400f
---

 vlc-android/assets/licence.htm |  100 ++++++++++++++++++++++++++++------------
 1 file changed, 70 insertions(+), 30 deletions(-)

diff --git a/vlc-android/assets/licence.htm b/vlc-android/assets/licence.htm
index 9678872..9b18979 100644
--- a/vlc-android/assets/licence.htm
+++ b/vlc-android/assets/licence.htm
@@ -19,36 +19,39 @@
         <p>Some VLC plugins use external libraries that make extensive use of the following persons' or companies' code:
         <ul>
             <li>ActionBarSherlock - Copyright © 2011-2012 Jake Wharton - <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</a></li>
-            <li>FFmpeg/Libav - Copyright © 2000-2010 the FFmpeg developers</li>
-            <li>liba52 - Aaron Holtzman & Michel Lespinasse, et al.</li>
-            <li>Flac - Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson</li>
-            <li>Freetype</li>
-            <li>Fribidi</li>
-            <li>GnuTLS</li>
-            <li>libgsm</li>
-            <li>libiconv</li>
-            <li>libass</li>
-            <li>libdca</li>
-            <li>libdvbpsi</li>
-            <li>libebml</li>
-            <li>libgcrypt</li>
-            <li>libgpg-error</li>
-            <li>libmad</li>
-            <li>libmatroska</li>
-            <li>libmodplug</li>
-            <li>libmpeg2</li>
-            <li>libogg</li>
-            <li>libpng</li>
-            <li>libtheora</li>
-            <li>libxml2</li>
-            <li>live555</li>
-            <li>lua</li>
-            <li>openjpeg</li>
-            <li>orc</li>
-            <li>schroedinger</li>
-            <li>speex</li>
-            <li>taglib</li>
-            <li>zlib</li>
+            <li>Android Open Source Project - Copyright © 2008 The Android Open Source Project - <a href="http://opensource.org/licenses/ISC">2-clause BSD licence</a></li>
+            <li>FFmpeg/Libav - Copyright © 2000-2010 the FFmpeg developers - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>FLAC - Copyright © 2001-2012 Josh Coalson et al. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a>, codec libs <a href="#xiph">Xiph.org BSD licence</a></li>
+            <li>Freetype2 - Copyright © 2006-2011 by David Turner, Robert Wilhelm, and Werner Lemberg. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>Fribidi - Copyright © Behdad Esfahbod - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>GnuTLS - Copyright © 2000-2012 Free Software Foundation - <a href="http://www.gnu.org/licenses/gpl-3.0.txt">GPL v3 or later</a></li>
+            <li>GOOM! - Copyright © 2000-2004 Jean-Christophe Hoelt - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>GSM - Copyright © 1992-1994 Jutta Degener & Carsten Bormann - <a href="#gsm">GSM permissive licence</a></li>
+            <li>liba52 - Aaron Holtzman, Michel Lespinasse, et al. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libass - Copyright © Evgeniy Stepanov, Grigori Goronzy, et al. - <a href="http://opensource.org/licenses/ISC">ISC licence</a></li>
+            <li>libdca - Gildas Bazin, Sam Hocevar, et al. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libdvbpsi - Copyright © 2001-2010 VideoLAN - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>libebml - Copyright © 2002-2010 Steve Lhomme - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libgcrypt - Copyright © 2000-2012 Free Software Foundation. - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>libgpg-error - Copyright © 2003 g10 Code GmbH - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>libiconv - Copyright © 1999-2001 Free Software Foundation - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>libmad - Copyright © 2000-2004 Underbit Technologies, Inc. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libmatroska - Copyright © 2002-2003 Steve Lhomme - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libmodplug - Olivier Lapicque, Konstanty - <u>Public domain</u></li>
+            <li>libmpeg2 - Copyright © 1999-2012 Sam Hocevar, Aaron Holtzman, Michel Lespinasse, Christophe Massiot, et al. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libogg - Copyright © 2002 Xiph.org Foundation - <a href="#xiph">Xiph.org BSD licence</a></li>
+            <li>libpng - Copyright © 2004,2006-2012 Glenn Randers-Pehrson, et al. - <a href="http://www.libpng.org/pub/png/src/libpng-LICENSE.txt">libpng licence</a></li>
+            <li>libpostproc - Copyright © 2001-2003 Michael Niedermayer - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
+            <li>libtheora - Copyright © Xiph.org - <a href="#xiph">Xiph.org BSD licence</a></li>
+            <li>libxml2 - Copyright © 1998-2003 Daniel Veillard - <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a></li>
+            <li>live555 - Copyright © 1996-2012 Live Networks, Inc - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>Lua - Copyright © 1994-2008 Lua.org - <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a></li>
+            <li>Openjpeg - Copyright © 2002-2012, Communications and Remote Sensing Laboratory, UCL, Belgium - <a href="http://opensource.org/licenses/ISC">ISC licence</a></li>
+            <li>ORC - Copyright © 2002-2009 David A. Schleef - <a href="http://opensource.org/licenses/ISC">ISC licence</a></li>
+            <li>Schroedinger - Copyright © David Schleef, W.J. van der Laan - <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a></li>
+            <li>Speex, Speexdsp - Copyright © 1992-2008 Xiph.org Foundation, Jean-Marc Valin, Analog Devices Inc, Commonwealth Scientific and Industrial Research Organisation, David Rowe, Jutta Degener, Carsten Bormann - <a href="http://www.opensource.org/licenses/BSD-3-Clause">3-clause BSD licence</a></li>
+            <li>Taglib - Copyright © 2002-2008 Scott Wheeler, et al. - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
+            <li>Zlib - Copyright © 1995-2012 Jean-loup Gailly and Mark Adler - <a href="http://zlib.net/zlib_license.html">zlib licence</a></li>
         </ul>
         </p>
       </div>
@@ -683,6 +686,43 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.</p>
       </div>
       <p><a href="#top">Back to the top</a></p>
+<h3 id="xiph">Xiph.org BSD-like licence</h3>
+<p>Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson</p>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+<ul>
+<li>Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.</li>
+<li>Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.</li>
+<li>Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.</li>
+</ul>
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+<p><a href="#top">Back to the top</a></p>
+<h3 id="gsm">GSM permissive licence</h3>
+<p>
+Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that this notice is not removed and that neither the authors nor the Technische Universitaet Berlin are deemed to have made any representations as to the suitability of this software for any purpose nor are held responsible for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+</p>
+<p><a href="#top">Back to the top</a></p>
 </body>
 
 </html>



More information about the Android mailing list