From ee313fa40fb54d06c7f300dedcf8ce5a8c19ecca Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 10 Oct 2023 19:21:54 -0600 Subject: [PATCH] Move //third_party/glfw to //flutter/third_party/glfw (flutter/engine#46733) As part of eliminating the Flutter buildroot (#67373), we are moving all third-party dependencies from //third_party to //flutter/third_party. This is the engine-side follow-up to flutter/buildroot#777. Once all third-party dependencies have been migrated, tooling and config will be moved and the buildroot will be eliminated altogether. Issue: https://github.com/flutter/flutter/issues/136284 No tests changed because there is no semantic change to this PR. This is simply relocating a dependency. --- DEPS | 4 +- engine/src/flutter/ci/licenses.sh | 2 +- .../flutter/ci/licenses_golden/excluded_files | 30 +- .../ci/licenses_golden/licenses_flutter | 636 +++++++++++++++++- .../flutter/ci/licenses_golden/tool_signature | 2 +- engine/src/flutter/examples/glfw/BUILD.gn | 2 +- engine/src/flutter/examples/glfw_drm/BUILD.gn | 2 +- .../src/flutter/examples/vulkan_glfw/BUILD.gn | 2 +- engine/src/flutter/impeller/BUILD.gn | 2 +- .../src/flutter/impeller/playground/BUILD.gn | 2 +- .../src/flutter/shell/platform/glfw/BUILD.gn | 2 +- .../src/flutter/tools/licenses/lib/paths.dart | 4 +- 12 files changed, 662 insertions(+), 28 deletions(-) diff --git a/DEPS b/DEPS index 55d136a23df..b0384d42d47 100644 --- a/DEPS +++ b/DEPS @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5d60bd2eb4642b64d00c845e5ca9f1ea41fd6db6', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '1d2965f9b0f784abea8ddbeb54827afa9ed196b9', # Fuchsia compatibility # @@ -282,7 +282,7 @@ deps = { 'src/third_party/libcxxabi': Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12', - 'src/third_party/glfw': + 'src/flutter/third_party/glfw': Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127', 'src/third_party/shaderc': diff --git a/engine/src/flutter/ci/licenses.sh b/engine/src/flutter/ci/licenses.sh index c38b0812699..2989505ae17 100755 --- a/engine/src/flutter/ci/licenses.sh +++ b/engine/src/flutter/ci/licenses.sh @@ -156,7 +156,7 @@ function verify_licenses() ( local actualLicenseCount actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')" - local expectedLicenseCount=20 # When changing this number: Update the error message below as well describing the newly expected license types. + local expectedLicenseCount=39 # When changing this number: Update the error message below as well describing the newly expected license types. if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then echo "=============================== ERROR ===============================" diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index de5f863f243..7bfa23f637b 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -430,6 +430,21 @@ ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc ../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc ../../../flutter/third_party/accessibility/gfx/test +../../../flutter/third_party/glfw/.appveyor.yml +../../../flutter/third_party/glfw/.git +../../../flutter/third_party/glfw/.gitattributes +../../../flutter/third_party/glfw/.github +../../../flutter/third_party/glfw/.gitignore +../../../flutter/third_party/glfw/.mailmap +../../../flutter/third_party/glfw/CMake +../../../flutter/third_party/glfw/CMakeLists.txt +../../../flutter/third_party/glfw/CONTRIBUTORS.md +../../../flutter/third_party/glfw/README.md +../../../flutter/third_party/glfw/deps +../../../flutter/third_party/glfw/docs +../../../flutter/third_party/glfw/examples +../../../flutter/third_party/glfw/src/CMakeLists.txt +../../../flutter/third_party/glfw/tests ../../../flutter/third_party/gn ../../../flutter/third_party/ninja ../../../flutter/third_party/spring_animation/README.md @@ -2021,21 +2036,6 @@ ../../../third_party/freetype2/src/winfonts/rules.mk ../../../third_party/freetype2/tests ../../../third_party/freetype2/vms_make.com -../../../third_party/glfw/.appveyor.yml -../../../third_party/glfw/.git -../../../third_party/glfw/.gitattributes -../../../third_party/glfw/.github -../../../third_party/glfw/.gitignore -../../../third_party/glfw/.mailmap -../../../third_party/glfw/CMake -../../../third_party/glfw/CMakeLists.txt -../../../third_party/glfw/CONTRIBUTORS.md -../../../third_party/glfw/README.md -../../../third_party/glfw/deps -../../../third_party/glfw/docs -../../../third_party/glfw/examples -../../../third_party/glfw/src/CMakeLists.txt -../../../third_party/glfw/tests ../../../third_party/google_fonts_for_unit_tests ../../../third_party/googletest ../../../third_party/gradle diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index ef7dab5c618..3a336880ef3 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -277,6 +277,331 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================================================== +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h +ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h.in +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/mappings.h +FILE: ../../../flutter/third_party/glfw/src/mappings.h.in +---------------------------------------------------------------------------------------------------- +Copyright (C) 1997-2013 Sam Lantinga + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the +use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/LICENSE.md +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/glfw.rc.in +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard + +Copyright (c) 2006-2019 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/context.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/context.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard +Copyright (c) 2006-2016 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/linux_joystick.c +ORIGIN: ../../../flutter/third_party/glfw/src/posix_thread.c +ORIGIN: ../../../flutter/third_party/glfw/src/posix_thread.h +ORIGIN: ../../../flutter/third_party/glfw/src/posix_time.c +ORIGIN: ../../../flutter/third_party/glfw/src/posix_time.h +ORIGIN: ../../../flutter/third_party/glfw/src/win32_thread.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_thread.h +ORIGIN: ../../../flutter/third_party/glfw/src/win32_time.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_time.h +ORIGIN: ../../../flutter/third_party/glfw/src/xkb_unicode.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/linux_joystick.c +FILE: ../../../flutter/third_party/glfw/src/posix_thread.c +FILE: ../../../flutter/third_party/glfw/src/posix_thread.h +FILE: ../../../flutter/third_party/glfw/src/posix_time.c +FILE: ../../../flutter/third_party/glfw/src/posix_time.h +FILE: ../../../flutter/third_party/glfw/src/win32_thread.c +FILE: ../../../flutter/third_party/glfw/src/win32_thread.h +FILE: ../../../flutter/third_party/glfw/src/win32_time.c +FILE: ../../../flutter/third_party/glfw/src/win32_time.h +FILE: ../../../flutter/third_party/glfw/src/xkb_unicode.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard +Copyright (c) 2006-2017 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/include/GLFW/glfw3native.h +ORIGIN: ../../../flutter/third_party/glfw/src/init.c +ORIGIN: ../../../flutter/third_party/glfw/src/platform.c +ORIGIN: ../../../flutter/third_party/glfw/src/platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/vulkan.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/include/GLFW/glfw3native.h +FILE: ../../../flutter/third_party/glfw/src/init.c +FILE: ../../../flutter/third_party/glfw/src/platform.c +FILE: ../../../flutter/third_party/glfw/src/platform.h +FILE: ../../../flutter/third_party/glfw/src/vulkan.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard +Copyright (c) 2006-2018 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/include/GLFW/glfw3.h +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_monitor.m +ORIGIN: ../../../flutter/third_party/glfw/src/egl_context.c +ORIGIN: ../../../flutter/third_party/glfw/src/glx_context.c +ORIGIN: ../../../flutter/third_party/glfw/src/input.c +ORIGIN: ../../../flutter/third_party/glfw/src/internal.h +ORIGIN: ../../../flutter/third_party/glfw/src/monitor.c +ORIGIN: ../../../flutter/third_party/glfw/src/wgl_context.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_init.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_joystick.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_monitor.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/win32_window.c +ORIGIN: ../../../flutter/third_party/glfw/src/x11_init.c +ORIGIN: ../../../flutter/third_party/glfw/src/x11_monitor.c +ORIGIN: ../../../flutter/third_party/glfw/src/x11_platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/x11_window.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/include/GLFW/glfw3.h +FILE: ../../../flutter/third_party/glfw/src/cocoa_monitor.m +FILE: ../../../flutter/third_party/glfw/src/egl_context.c +FILE: ../../../flutter/third_party/glfw/src/glx_context.c +FILE: ../../../flutter/third_party/glfw/src/input.c +FILE: ../../../flutter/third_party/glfw/src/internal.h +FILE: ../../../flutter/third_party/glfw/src/monitor.c +FILE: ../../../flutter/third_party/glfw/src/wgl_context.c +FILE: ../../../flutter/third_party/glfw/src/win32_init.c +FILE: ../../../flutter/third_party/glfw/src/win32_joystick.c +FILE: ../../../flutter/third_party/glfw/src/win32_monitor.c +FILE: ../../../flutter/third_party/glfw/src/win32_platform.h +FILE: ../../../flutter/third_party/glfw/src/win32_window.c +FILE: ../../../flutter/third_party/glfw/src/x11_init.c +FILE: ../../../flutter/third_party/glfw/src/x11_monitor.c +FILE: ../../../flutter/third_party/glfw/src/x11_platform.h +FILE: ../../../flutter/third_party/glfw/src/x11_window.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard +Copyright (c) 2006-2019 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/window.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/window.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2002-2006 Marcus Geelnard +Copyright (c) 2006-2019 Camilla Löwy +Copyright (c) 2012 Torsten Walluhn + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_joystick.h +ORIGIN: ../../../flutter/third_party/glfw/src/null_joystick.h +ORIGIN: ../../../flutter/third_party/glfw/src/win32_joystick.h +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/cocoa_joystick.h +FILE: ../../../flutter/third_party/glfw/src/null_joystick.h +FILE: ../../../flutter/third_party/glfw/src/win32_joystick.h +---------------------------------------------------------------------------------------------------- +Copyright (c) 2006-2017 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h +ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h.in +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/mappings.h +FILE: ../../../flutter/third_party/glfw/src/mappings.h.in +---------------------------------------------------------------------------------------------------- +Copyright (c) 2006-2018 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: accessibility ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets.cc + ../../../flutter/third_party/accessibility/LICENSE @@ -312,6 +637,125 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_time.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/cocoa_time.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2009-2016 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_init.m +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_window.m +ORIGIN: ../../../flutter/third_party/glfw/src/nsgl_context.m +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/cocoa_init.m +FILE: ../../../flutter/third_party/glfw/src/cocoa_platform.h +FILE: ../../../flutter/third_party/glfw/src/cocoa_window.m +FILE: ../../../flutter/third_party/glfw/src/nsgl_context.m +---------------------------------------------------------------------------------------------------- +Copyright (c) 2009-2019 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_joystick.m +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/cocoa_joystick.m +---------------------------------------------------------------------------------------------------- +Copyright (c) 2009-2019 Camilla Löwy +Copyright (c) 2012 Torsten Walluhn + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_time.h +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/cocoa_time.h +---------------------------------------------------------------------------------------------------- +Copyright (c) 2009-2021 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: accessibility ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.cc + ../../../flutter/third_party/accessibility/LICENSE @@ -530,6 +974,44 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/linux_joystick.h +ORIGIN: ../../../flutter/third_party/glfw/src/wl_init.c +ORIGIN: ../../../flutter/third_party/glfw/src/wl_monitor.c +ORIGIN: ../../../flutter/third_party/glfw/src/wl_platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/wl_window.c +ORIGIN: ../../../flutter/third_party/glfw/src/xkb_unicode.h +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/linux_joystick.h +FILE: ../../../flutter/third_party/glfw/src/wl_init.c +FILE: ../../../flutter/third_party/glfw/src/wl_monitor.c +FILE: ../../../flutter/third_party/glfw/src/wl_platform.h +FILE: ../../../flutter/third_party/glfw/src/wl_window.c +FILE: ../../../flutter/third_party/glfw/src/xkb_unicode.h +---------------------------------------------------------------------------------------------------- +Copyright (c) 2014 Jonas Ådahl + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: accessibility ORIGIN: ../../../flutter/third_party/accessibility/base/win/windows_types.h + ../../../flutter/third_party/accessibility/LICENSE @@ -565,6 +1047,158 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/null_init.c +ORIGIN: ../../../flutter/third_party/glfw/src/null_platform.h +ORIGIN: ../../../flutter/third_party/glfw/src/osmesa_context.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/null_init.c +FILE: ../../../flutter/third_party/glfw/src/null_platform.h +FILE: ../../../flutter/third_party/glfw/src/osmesa_context.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2016 Google Inc. +Copyright (c) 2016-2017 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/null_monitor.c +ORIGIN: ../../../flutter/third_party/glfw/src/null_window.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/null_monitor.c +FILE: ../../../flutter/third_party/glfw/src/null_window.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2016 Google Inc. +Copyright (c) 2016-2019 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/null_joystick.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/null_joystick.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2016-2017 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/posix_module.c +ORIGIN: ../../../flutter/third_party/glfw/src/win32_module.c +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/posix_module.c +FILE: ../../../flutter/third_party/glfw/src/win32_module.c +---------------------------------------------------------------------------------------------------- +Copyright (c) 2021 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + +==================================================================================================== +LIBRARY: glfw +ORIGIN: ../../../flutter/third_party/glfw/src/posix_poll.c +ORIGIN: ../../../flutter/third_party/glfw/src/posix_poll.h +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/glfw/src/posix_poll.c +FILE: ../../../flutter/third_party/glfw/src/posix_poll.h +---------------------------------------------------------------------------------------------------- +Copyright (c) 2022 Camilla Löwy + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: web_locale_keymap ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap.dart + ../../../flutter/third_party/web_locale_keymap/License.txt @@ -6849,4 +7483,4 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ==================================================================================================== -Total license count: 20 +Total license count: 39 diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index bb1142c385e..12e514691e3 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 575f2a41ff152394b7e539742fa248e6 +Signature: 2da12666eedd83b571506f27f8445d99 diff --git a/engine/src/flutter/examples/glfw/BUILD.gn b/engine/src/flutter/examples/glfw/BUILD.gn index 2ff312c0ee8..178bac61e4e 100644 --- a/engine/src/flutter/examples/glfw/BUILD.gn +++ b/engine/src/flutter/examples/glfw/BUILD.gn @@ -12,7 +12,7 @@ if (build_embedder_examples) { deps = [ "//flutter/shell/platform/embedder:embedder", - "//third_party/glfw", + "//flutter/third_party/glfw", ] } } diff --git a/engine/src/flutter/examples/glfw_drm/BUILD.gn b/engine/src/flutter/examples/glfw_drm/BUILD.gn index 784e5654e5e..afa204c76c7 100644 --- a/engine/src/flutter/examples/glfw_drm/BUILD.gn +++ b/engine/src/flutter/examples/glfw_drm/BUILD.gn @@ -12,7 +12,7 @@ if (build_embedder_examples) { deps = [ "//flutter/shell/platform/embedder:embedder", - "//third_party/glfw", + "//flutter/third_party/glfw", ] libs = [ "EGL" ] diff --git a/engine/src/flutter/examples/vulkan_glfw/BUILD.gn b/engine/src/flutter/examples/vulkan_glfw/BUILD.gn index 021d09f1efe..cea552f66e2 100644 --- a/engine/src/flutter/examples/vulkan_glfw/BUILD.gn +++ b/engine/src/flutter/examples/vulkan_glfw/BUILD.gn @@ -9,7 +9,7 @@ executable("vulkan_glfw") { deps = [ "//flutter/shell/platform/embedder:embedder", - "//third_party/glfw", + "//flutter/third_party/glfw", "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers", ] } diff --git a/engine/src/flutter/impeller/BUILD.gn b/engine/src/flutter/impeller/BUILD.gn index 9214c02f119..696226f8fe3 100644 --- a/engine/src/flutter/impeller/BUILD.gn +++ b/engine/src/flutter/impeller/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/glfw/glfw_args.gni") +import("//flutter/third_party/glfw/glfw_args.gni") import("tools/impeller.gni") config("impeller_public_config") { diff --git a/engine/src/flutter/impeller/playground/BUILD.gn b/engine/src/flutter/impeller/playground/BUILD.gn index 08e47647dc7..25408c569b7 100644 --- a/engine/src/flutter/impeller/playground/BUILD.gn +++ b/engine/src/flutter/impeller/playground/BUILD.gn @@ -47,7 +47,7 @@ impeller_component("playground") { "../scene/shaders", "imgui:imgui_impeller_backend", "//flutter/fml", - "//third_party/glfw", + "//flutter/third_party/glfw", "//third_party/imgui:imgui_glfw", ] diff --git a/engine/src/flutter/shell/platform/glfw/BUILD.gn b/engine/src/flutter/shell/platform/glfw/BUILD.gn index 9d23979d957..1bf6d587f05 100644 --- a/engine/src/flutter/shell/platform/glfw/BUILD.gn +++ b/engine/src/flutter/shell/platform/glfw/BUILD.gn @@ -59,7 +59,7 @@ source_set("flutter_glfw") { "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw", - "//third_party/glfw", + "//flutter/third_party/glfw", "//third_party/rapidjson", ] diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index 4118cecee57..1e79b9e0e5b 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -29,6 +29,8 @@ final Set skippedPaths = { r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts r'flutter/prebuilts', r'flutter/sky/packages/sky_engine/LICENSE', + r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build. + r'flutter/third_party/glfw/docs', r'flutter/third_party/gn', r'flutter/third_party/ninja', // build system r'flutter/third_party/test_shaders', // for tests only @@ -98,8 +100,6 @@ final Set skippedPaths = { r'third_party/fontconfig', // not used in standard configurations r'third_party/freetype2/builds', r'third_party/freetype2/src/tools', - r'third_party/glfw/deps', // Only used by examples and tests; not linked in build. - r'third_party/glfw/docs', r'third_party/gradle', r'third_party/harfbuzz/docs', r'third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary