summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-12-19 15:29:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-20 14:53:55 +0000
commit4ad9d0f6f7941cea89c3121405f961666f1e0c7f (patch)
treebe868e90dd08bc7478fe7cf4659016aa7f5efcd4 /meta
parent0e2cf3ecaff49dd1fb35267ecbfb4f89290fd90c (diff)
downloadpoky-4ad9d0f6f7941cea89c3121405f961666f1e0c7f.tar.gz
common-licenses: update Libpng license text
The new libpng license comprises the terms and conditions from the zlib license, and the disclaimer from the Boost license. The legacy libpng license license, used until libpng-1.6.35, is appended to the new license, following the precedent established in the Python Software Foundation License version 2. See for details: https://sourceforge.net/projects/libpng/files/libpng16/1.6.36/ (From OE-Core rev: 673c2dcf1045f7264570f81e2880d7a03befd2af) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/files/common-licenses/Libpng200
1 files changed, 111 insertions, 89 deletions
diff --git a/meta/files/common-licenses/Libpng b/meta/files/common-licenses/Libpng
index a9d5b031b0..62ab8e48dc 100644
--- a/meta/files/common-licenses/Libpng
+++ b/meta/files/common-licenses/Libpng
@@ -1,112 +1,134 @@
1 1COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
2This copy of the libpng notices is provided for your convenience. In case of 2=========================================
3any discrepancy between this copy and the notices in the file png.h that is 3
4included in the libpng distribution, the latter shall prevail. 4PNG Reference Library License version 2
5 5---------------------------------------
6COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: 6
7 7 * Copyright (c) 1995-2018 The PNG Reference Library Authors.
8If you modify libpng you may insert additional notices immediately following 8 * Copyright (c) 2018 Cosmin Truta.
9this sentence. 9 * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
10 10 * Copyright (c) 1996-1997 Andreas Dilger.
11This code is released under the libpng license. 11 * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
12 12
13libpng versions 1.2.6, August 15, 2004, through 1.4.5, December 9, 2010, are 13The software is supplied "as is", without warranty of any kind,
14Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are 14express or implied, including, without limitation, the warranties
15distributed according to the same disclaimer and license as libpng-1.2.5 15of merchantability, fitness for a particular purpose, title, and
16with the following individual added to the list of Contributing Authors 16non-infringement. In no even shall the Copyright owners, or
17 17anyone distributing the software, be liable for any damages or
18 Cosmin Truta 18other liability, whether in contract, tort or otherwise, arising
19 19from, out of, or in connection with the software, or the use or
20libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are 20other dealings in the software, even if advised of the possibility
21Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are 21of such damage.
22distributed according to the same disclaimer and license as libpng-1.0.6 22
23with the following individuals added to the list of Contributing Authors 23Permission is hereby granted to use, copy, modify, and distribute
24 24this software, or portions hereof, for any purpose, without fee,
25 Simon-Pierre Cadieux 25subject to the following restrictions:
26 Eric S. Raymond 26
27 Gilles Vollant 27 1. The origin of this software must not be misrepresented; you
28 must not claim that you wrote the original software. If you
29 use this software in a product, an acknowledgment in the product
30 documentation would be appreciated, but is not required.
31
32 2. Altered source versions must be plainly marked as such, and must
33 not be misrepresented as being the original software.
34
35 3. This Copyright notice may not be removed or altered from any
36 source or altered source distribution.
37
38
39PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
40-----------------------------------------------------------------------
41
42libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
43Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
44derived from libpng-1.0.6, and are distributed according to the same
45disclaimer and license as libpng-1.0.6 with the following individuals
46added to the list of Contributing Authors:
47
48 Simon-Pierre Cadieux
49 Eric S. Raymond
50 Mans Rullgard
51 Cosmin Truta
52 Gilles Vollant
53 James Yu
54 Mandar Sahastrabuddhe
55 Google Inc.
56 Vadim Barkov
28 57
29and with the following additions to the disclaimer: 58and with the following additions to the disclaimer:
30 59
31 There is no warranty against interference with your enjoyment of the 60 There is no warranty against interference with your enjoyment of
32 library or against infringement. There is no warranty that our 61 the library or against infringement. There is no warranty that our
33 efforts or the library will fulfill any of your particular purposes 62 efforts or the library will fulfill any of your particular purposes
34 or needs. This library is provided with all faults, and the entire 63 or needs. This library is provided with all faults, and the entire
35 risk of satisfactory quality, performance, accuracy, and effort is with 64 risk of satisfactory quality, performance, accuracy, and effort is
36 the user. 65 with the user.
66
67Some files in the "contrib" directory and some configure-generated
68files that are distributed with libpng have other copyright owners, and
69are released under other open source licenses.
37 70
38libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are 71libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
39Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are 72Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
40distributed according to the same disclaimer and license as libpng-0.96, 73libpng-0.96, and are distributed according to the same disclaimer and
41with the following individuals added to the list of Contributing Authors: 74license as libpng-0.96, with the following individuals added to the
75list of Contributing Authors:
42 76
43 Tom Lane 77 Tom Lane
44 Glenn Randers-Pehrson 78 Glenn Randers-Pehrson
45 Willem van Schaik 79 Willem van Schaik
46 80
47libpng versions 0.89, June 1996, through 0.96, May 1997, are 81libpng versions 0.89, June 1996, through 0.96, May 1997, are
48Copyright (c) 1996, 1997 Andreas Dilger 82Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
49Distributed according to the same disclaimer and license as libpng-0.88, 83and are distributed according to the same disclaimer and license as
50with the following individuals added to the list of Contributing Authors: 84libpng-0.88, with the following individuals added to the list of
85Contributing Authors:
51 86
52 John Bowler 87 John Bowler
53 Kevin Bracey 88 Kevin Bracey
54 Sam Bushell 89 Sam Bushell
55 Magnus Holmgren 90 Magnus Holmgren
56 Greg Roelofs 91 Greg Roelofs
57 Tom Tanner 92 Tom Tanner
93
94Some files in the "scripts" directory have other copyright owners,
95but are released under this license.
58 96
59libpng versions 0.5, May 1995, through 0.88, January 1996, are 97libpng versions 0.5, May 1995, through 0.88, January 1996, are
60Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. 98Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
61 99
62For the purposes of this copyright and license, "Contributing Authors" 100For the purposes of this copyright and license, "Contributing Authors"
63is defined as the following set of individuals: 101is defined as the following set of individuals:
64 102
65 Andreas Dilger 103 Andreas Dilger
66 Dave Martindale 104 Dave Martindale
67 Guy Eric Schalnat 105 Guy Eric Schalnat
68 Paul Schmidt 106 Paul Schmidt
69 Tim Wegner 107 Tim Wegner
70 108
71The PNG Reference Library is supplied "AS IS". The Contributing Authors 109The PNG Reference Library is supplied "AS IS". The Contributing
72and Group 42, Inc. disclaim all warranties, expressed or implied, 110Authors and Group 42, Inc. disclaim all warranties, expressed or
73including, without limitation, the warranties of merchantability and of 111implied, including, without limitation, the warranties of
74fitness for any purpose. The Contributing Authors and Group 42, Inc. 112merchantability and of fitness for any purpose. The Contributing
75assume no liability for direct, indirect, incidental, special, exemplary, 113Authors and Group 42, Inc. assume no liability for direct, indirect,
76or consequential damages, which may result from the use of the PNG 114incidental, special, exemplary, or consequential damages, which may
77Reference Library, even if advised of the possibility of such damage. 115result from the use of the PNG Reference Library, even if advised of
116the possibility of such damage.
78 117
79Permission is hereby granted to use, copy, modify, and distribute this 118Permission is hereby granted to use, copy, modify, and distribute this
80source code, or portions hereof, for any purpose, without fee, subject 119source code, or portions hereof, for any purpose, without fee, subject
81to the following restrictions: 120to the following restrictions:
82 121
831. The origin of this source code must not be misrepresented. 122 1. The origin of this source code must not be misrepresented.
84
852. Altered versions must be plainly marked as such and must not
86 be misrepresented as being the original source.
87
883. This Copyright notice may not be removed or altered from any
89 source or altered source distribution.
90
91The Contributing Authors and Group 42, Inc. specifically permit, without
92fee, and encourage the use of this source code as a component to
93supporting the PNG file format in commercial products. If you use this
94source code in a product, acknowledgment is not required but would be
95appreciated.
96
97
98A "png_get_copyright" function is available, for convenient use in "about"
99boxes and the like:
100
101 printf("%s",png_get_copyright(NULL));
102
103Also, the PNG logo (in PNG format, of course) is supplied in the
104files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
105 123
106Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a 124 2. Altered versions must be plainly marked as such and must not
107certification mark of the Open Source Initiative. 125 be misrepresented as being the original source.
108 126
109Glenn Randers-Pehrson 127 3. This Copyright notice may not be removed or altered from any
110glennrp at users.sourceforge.net 128 source or altered source distribution.
111December 9, 2010
112 129
130The Contributing Authors and Group 42, Inc. specifically permit,
131without fee, and encourage the use of this source code as a component
132to supporting the PNG file format in commercial products. If you use
133this source code in a product, acknowledgment is not required but would
134be appreciated.