Tue, 04 Feb 2020 02:10:49 +0000
Merge
.hgtags | file | annotate | diff | comparison | revisions | |
THIRD_PARTY_README | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jan 27 05:09:57 2020 +0000 1.2 +++ b/.hgtags Tue Feb 04 02:10:49 2020 +0000 1.3 @@ -990,3 +990,4 @@ 1.4 5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga 1.5 30768a181ad0f4ba3d37f00bf23d76c875cb043a jdk8u252-b00 1.6 5f55e79422a0246076db7d3f2a2c44cb36e0e271 jdk8u252-b01 1.7 +a013ce3462fc144cc83347be67109c4e4e4b26ff jdk8u252-b02
2.1 --- a/THIRD_PARTY_README Mon Jan 27 05:09:57 2020 +0000 2.2 +++ b/THIRD_PARTY_README Tue Feb 04 02:10:49 2020 +0000 2.3 @@ -1712,10 +1712,9 @@ 2.4 2.5 --- begin of LICENSE --- 2.6 2.7 - Mesa 3-D graphics library 2.8 - Version: 5.0 2.9 - 2.10 - Copyright (C) 1999-2002 Brian Paul All Rights Reserved. 2.11 + Mesa 3-D Graphics Library v19.2.1 2.12 + 2.13 + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. 2.14 2.15 Permission is hereby granted, free of charge, to any person obtaining a 2.16 copy of this software and associated documentation files (the "Software"), 2.17 @@ -1730,9 +1729,118 @@ 2.18 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 2.19 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.20 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 2.21 - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN 2.22 - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 2.23 - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 2.24 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 2.25 + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 2.26 + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 2.27 + SOFTWARE. 2.28 + 2.29 +Attention, Contributors 2.30 + 2.31 +When contributing to the Mesa project you must agree to the licensing terms 2.32 +of the component to which you're contributing. 2.33 +The following section lists the primary components of the Mesa distribution 2.34 +and their respective licenses. 2.35 +Mesa Component Licenses 2.36 + 2.37 + 2.38 + 2.39 +Component Location License 2.40 +------------------------------------------------------------------ 2.41 +Main Mesa code src/mesa/ MIT 2.42 +Device drivers src/mesa/drivers/* MIT, generally 2.43 + 2.44 +Gallium code src/gallium/ MIT 2.45 + 2.46 +Ext headers GL/glext.h Khronos 2.47 + GL/glxext.h Khronos 2.48 + GL/wglext.h Khronos 2.49 + KHR/khrplatform.h Khronos 2.50 + 2.51 +***************************************************************************** 2.52 + 2.53 +---- 2.54 +include/GL/gl.h : 2.55 + 2.56 + 2.57 + Mesa 3-D graphics library 2.58 + 2.59 + Copyright (C) 1999-2006 Brian Paul All Rights Reserved. 2.60 + Copyright (C) 2009 VMware, Inc. All Rights Reserved. 2.61 + 2.62 + Permission is hereby granted, free of charge, to any person obtaining a 2.63 + copy of this software and associated documentation files (the "Software"), 2.64 + to deal in the Software without restriction, including without limitation 2.65 + the rights to use, copy, modify, merge, publish, distribute, sublicense, 2.66 + and/or sell copies of the Software, and to permit persons to whom the 2.67 + Software is furnished to do so, subject to the following conditions: 2.68 + 2.69 + The above copyright notice and this permission notice shall be included 2.70 + in all copies or substantial portions of the Software. 2.71 + 2.72 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 2.73 + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.74 + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 2.75 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 2.76 + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 2.77 + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 2.78 + OTHER DEALINGS IN THE SOFTWARE. 2.79 + 2.80 + ***************************************************************************** 2.81 + 2.82 +---- 2.83 +include/GL/glext.h 2.84 +include/GL/glxext.h 2.85 +include/GL/wglxext.h : 2.86 + 2.87 + 2.88 + Copyright (c) 2013 - 2018 The Khronos Group Inc. 2.89 + 2.90 + Permission is hereby granted, free of charge, to any person obtaining a 2.91 + copy of this software and/or associated documentation files (the 2.92 + "Materials"), to deal in the Materials without restriction, including 2.93 + without limitation the rights to use, copy, modify, merge, publish, 2.94 + distribute, sublicense, and/or sell copies of the Materials, and to 2.95 + permit persons to whom the Materials are furnished to do so, subject to 2.96 + the following conditions: 2.97 + 2.98 + The above copyright notice and this permission notice shall be included 2.99 + in all copies or substantial portions of the Materials. 2.100 + 2.101 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 2.102 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 2.103 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 2.104 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 2.105 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 2.106 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 2.107 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 2.108 + 2.109 + ***************************************************************************** 2.110 + 2.111 +---- 2.112 +include/KHR/khrplatform.h : 2.113 + 2.114 + Copyright (c) 2008 - 2018 The Khronos Group Inc. 2.115 + 2.116 + Permission is hereby granted, free of charge, to any person obtaining a 2.117 + copy of this software and/or associated documentation files (the 2.118 + "Materials"), to deal in the Materials without restriction, including 2.119 + without limitation the rights to use, copy, modify, merge, publish, 2.120 + distribute, sublicense, and/or sell copies of the Materials, and to 2.121 + permit persons to whom the Materials are furnished to do so, subject to 2.122 + the following conditions: 2.123 + 2.124 + The above copyright notice and this permission notice shall be included 2.125 + in all copies or substantial portions of the Materials. 2.126 + 2.127 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 2.128 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 2.129 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 2.130 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 2.131 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 2.132 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 2.133 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 2.134 + 2.135 + ***************************************************************************** 2.136 2.137 --- end of LICENSE --- 2.138
3.1 --- a/common/autoconf/generated-configure.sh Mon Jan 27 05:09:57 2020 +0000 3.2 +++ b/common/autoconf/generated-configure.sh Tue Feb 04 02:10:49 2020 +0000 3.3 @@ -4379,7 +4379,7 @@ 3.4 #CUSTOM_AUTOCONF_INCLUDE 3.5 3.6 # Do not change or remove the following line, it is needed for consistency checks: 3.7 -DATE_WHEN_GENERATED=1579517558 3.8 +DATE_WHEN_GENERATED=1580709484 3.9 3.10 ############################################################################### 3.11 # 3.12 @@ -19768,8 +19768,6 @@ 3.13 3.14 if test "x$with_cacerts_file" != x; then 3.15 CACERTS_FILE=$with_cacerts_file 3.16 - else 3.17 - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts 3.18 fi 3.19 3.20
4.1 --- a/common/autoconf/jdk-options.m4 Mon Jan 27 05:09:57 2020 +0000 4.2 +++ b/common/autoconf/jdk-options.m4 Tue Feb 04 02:10:49 2020 +0000 4.3 @@ -389,8 +389,6 @@ 4.4 [specify alternative cacerts file])]) 4.5 if test "x$with_cacerts_file" != x; then 4.6 CACERTS_FILE=$with_cacerts_file 4.7 - else 4.8 - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts 4.9 fi 4.10 AC_SUBST(CACERTS_FILE) 4.11