Merge jdk8u252-b02

Mon, 03 Feb 2020 05:45:07 +0000

author
andrew
date
Mon, 03 Feb 2020 05:45:07 +0000
changeset 3873
24a277806929
parent 3870
1f24b8ef2a38
parent 3872
b8ab53207035
child 3874
53ca7aa29c46

Merge

     1.1 --- a/THIRD_PARTY_README	Sat Jan 25 06:42:27 2020 +0000
     1.2 +++ b/THIRD_PARTY_README	Mon Feb 03 05:45:07 2020 +0000
     1.3 @@ -1710,10 +1710,9 @@
     1.4  
     1.5  --- begin of LICENSE ---
     1.6  
     1.7 - Mesa 3-D graphics library
     1.8 - Version:  5.0
     1.9 -
    1.10 - Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
    1.11 + Mesa 3-D Graphics Library v19.2.1
    1.12 +
    1.13 + Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
    1.14  
    1.15   Permission is hereby granted, free of charge, to any person obtaining a
    1.16   copy of this software and associated documentation files (the "Software"),
    1.17 @@ -1728,9 +1727,118 @@
    1.18   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    1.19   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.20   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    1.21 - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
    1.22 - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    1.23 - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    1.24 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.25 + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    1.26 + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    1.27 + SOFTWARE.
    1.28 +
    1.29 +Attention, Contributors
    1.30 +
    1.31 +When contributing to the Mesa project you must agree to the licensing terms
    1.32 +of the component to which you're contributing.
    1.33 +The following section lists the primary components of the Mesa distribution
    1.34 +and their respective licenses.
    1.35 +Mesa Component Licenses
    1.36 +
    1.37 +
    1.38 +
    1.39 +Component         Location               License
    1.40 +------------------------------------------------------------------
    1.41 +Main Mesa code    src/mesa/              MIT
    1.42 +Device drivers    src/mesa/drivers/*     MIT, generally
    1.43 +
    1.44 +Gallium code      src/gallium/           MIT
    1.45 +
    1.46 +Ext headers       GL/glext.h             Khronos
    1.47 +                  GL/glxext.h            Khronos
    1.48 +                  GL/wglext.h            Khronos
    1.49 +                  KHR/khrplatform.h      Khronos
    1.50 +
    1.51 +*****************************************************************************
    1.52 +
    1.53 +----
    1.54 +include/GL/gl.h :
    1.55 +
    1.56 +
    1.57 + Mesa 3-D graphics library
    1.58 +
    1.59 + Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
    1.60 + Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
    1.61 +
    1.62 + Permission is hereby granted, free of charge, to any person obtaining a
    1.63 + copy of this software and associated documentation files (the "Software"),
    1.64 + to deal in the Software without restriction, including without limitation
    1.65 + the rights to use, copy, modify, merge, publish, distribute, sublicense,
    1.66 + and/or sell copies of the Software, and to permit persons to whom the
    1.67 + Software is furnished to do so, subject to the following conditions:
    1.68 +
    1.69 + The above copyright notice and this permission notice shall be included
    1.70 + in all copies or substantial portions of the Software.
    1.71 +
    1.72 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    1.73 + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.74 + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    1.75 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
    1.76 + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    1.77 + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    1.78 + OTHER DEALINGS IN THE SOFTWARE.
    1.79 + 
    1.80 + *****************************************************************************
    1.81 +
    1.82 +----
    1.83 +include/GL/glext.h
    1.84 +include/GL/glxext.h
    1.85 +include/GL/wglxext.h :
    1.86 +
    1.87 +
    1.88 + Copyright (c) 2013 - 2018 The Khronos Group Inc.
    1.89 +
    1.90 + Permission is hereby granted, free of charge, to any person obtaining a
    1.91 + copy of this software and/or associated documentation files (the
    1.92 + "Materials"), to deal in the Materials without restriction, including
    1.93 + without limitation the rights to use, copy, modify, merge, publish,
    1.94 + distribute, sublicense, and/or sell copies of the Materials, and to
    1.95 + permit persons to whom the Materials are furnished to do so, subject to
    1.96 + the following conditions:
    1.97 +
    1.98 + The above copyright notice and this permission notice shall be included
    1.99 + in all copies or substantial portions of the Materials.
   1.100 +
   1.101 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   1.102 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   1.103 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   1.104 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   1.105 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   1.106 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   1.107 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
   1.108 +
   1.109 + *****************************************************************************
   1.110 +
   1.111 +----
   1.112 +include/KHR/khrplatform.h :
   1.113 +
   1.114 + Copyright (c) 2008 - 2018 The Khronos Group Inc.
   1.115 +
   1.116 + Permission is hereby granted, free of charge, to any person obtaining a
   1.117 + copy of this software and/or associated documentation files (the
   1.118 + "Materials"), to deal in the Materials without restriction, including
   1.119 + without limitation the rights to use, copy, modify, merge, publish,
   1.120 + distribute, sublicense, and/or sell copies of the Materials, and to
   1.121 + permit persons to whom the Materials are furnished to do so, subject to
   1.122 + the following conditions:
   1.123 +
   1.124 + The above copyright notice and this permission notice shall be included
   1.125 + in all copies or substantial portions of the Materials.
   1.126 +
   1.127 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   1.128 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   1.129 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   1.130 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   1.131 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   1.132 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   1.133 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
   1.134 +
   1.135 + *****************************************************************************
   1.136  
   1.137  --- end of LICENSE ---
   1.138  

mercurial