firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map glfw into third_party, and roll buildroot (flutter/engine#8308)

Browse Source 
Adds glfw to //third_party/, and rolls the buildroot to
ee817fb84542865e253bcce1866bc13e4065ca4d
to pick up the build rules for it.
This commit is contained in:
stuartmorgan
2019-03-27 14:08:22 -04:00
committed by GitHub
parent 610db85f04
commit ae4081652d
5 changed files with 208 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DEPS
View File

@@ -121,7 +121,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '9c7b023ff266ee58b00fe60326fa1db910a087f3',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ee817fb84542865e253bcce1866bc13e4065ca4d',
# Fuchsia compatibility
#
@@ -150,6 +150,9 @@ deps = {
'src/third_party/libcxxabi':
Var('fuchsia_git') + '/third_party/libcxxabi' + '@' + '1a9753522f1ae8d72848d365902f39e0d3d59a39',
'src/third_party/glfw':
Var('fuchsia_git') + '/third_party/glfw' + '@' + '999f3556fdd80983b10051746264489f2cb1ef16',
# Chromium-style
#
# As part of integrating with Fuchsia, we should eventually remove all these

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@@ -1,2 +1,2 @@
Signature: e7b89482e4ea9fef22a33ad9fcc34961
Signature: f2113ac67466eb24d34e9f41c3c59e17

188
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@@ -4730,6 +4730,194 @@ may be used:
CompuServe Incorporated. GIF(sm) is a Service Mark property of
CompuServe Incorporated."
--------------------------------------------------------------------------------
glfw
Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>
Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2009-2016 Camilla Berglund <elmindreda@glfw.org>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2009-2016 Camilla Berglund <elmindreda@glfw.org>
Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2010-2016 Camilla Berglund <elmindreda@glfw.org>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
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.
--------------------------------------------------------------------------------
glfw
Copyright (c) 2014-2015 Brandon Schaefer <brandon.schaefer@canonical.com>
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.
--------------------------------------------------------------------------------
harfbuzz
Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>

1
engine/src/flutter/tools/licenses/lib/filesystem.dart
View File

@@ -195,6 +195,7 @@ FileType identifyFile(String name, Reader reader) {
case '.jpg':
case '.jpeg': return FileType.binary; // JPEG
case '.ico': return FileType.binary; // Windows icon format
case '.icns': return FileType.binary; // macOS icon format
case '.bmp': return FileType.binary; // Windows bitmap format
case '.wbmp': return FileType.binary; // Wireless bitmap format
case '.webp': return FileType.binary; // WEBP

14
engine/src/flutter/tools/licenses/lib/main.dart
View File

@@ -1432,6 +1432,18 @@ class _RepositoryFreetypeDirectory extends _RepositoryDirectory {
}
}
class _RepositoryGlfwDirectory extends _RepositoryDirectory {
_RepositoryGlfwDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
@override
bool shouldRecurse(fs.IoNode entry) {
return entry.name != 'examples' // Not linked in build.
&& entry.name != 'tests' // Not linked in build.
&& entry.name != 'deps' // Only used by examples and tests; not linked in build.
&& super.shouldRecurse(entry);
}
}
class _RepositoryIcuDirectory extends _RepositoryDirectory {
_RepositoryIcuDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
@@ -1759,6 +1771,8 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
throw '//third_party/freetype-android is no longer part of this client: remove it';
if (entry.name == 'freetype2')
return _RepositoryFreetypeDirectory(this, entry);
if (entry.name == 'glfw')
return _RepositoryGlfwDirectory(this, entry);
if (entry.name == 'harfbuzz')
return _RepositoryHarfbuzzDirectory(this, entry);
if (entry.name == 'icu')