Skip to content

Commit

Permalink
Revert "Map glfw into third_party, and roll buildroot (flutter#8308)"
Browse files Browse the repository at this point in the history 
This reverts commit cef5030.
  • Loading branch information
@RBogie
RBogie committed Apr 8, 2019
1 parent 556ab63 commit d93f23a
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 508 deletions.
5 changes: 1 addition & 4 deletions DEPS
View file
Expand Up @@ -121,7 +121,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ee817fb84542865e253bcce1866bc13e4065ca4d',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '9c7b023ff266ee58b00fe60326fa1db910a087f3',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -150,9 +150,6 @@ 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
Expand Down
302 changes: 2 additions & 300 deletions ci/licenses_golden/licenses_third_party
View file
@@ -1,4 +1,4 @@
Signature: 7836db551ccf7833d0c865f0d2a3cfad
Signature: 6eb19e0e7f8dc1c24ff6d11400c5b80c

UNUSED LICENSES:

Expand Down Expand Up @@ -8014,304 +8014,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/COPYING.txt
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/.appveyor.yml
FILE: ../../../third_party/glfw/CMake/MacOSXBundleInfo.plist.in
FILE: ../../../third_party/glfw/cmake_uninstall.cmake.in
FILE: ../../../third_party/glfw/docs/Doxyfile.in
FILE: ../../../third_party/glfw/docs/DoxygenLayout.xml
FILE: ../../../third_party/glfw/docs/build.dox
FILE: ../../../third_party/glfw/docs/compat.dox
FILE: ../../../third_party/glfw/docs/compile.dox
FILE: ../../../third_party/glfw/docs/context.dox
FILE: ../../../third_party/glfw/docs/extra.less
FILE: ../../../third_party/glfw/docs/footer.html
FILE: ../../../third_party/glfw/docs/header.html
FILE: ../../../third_party/glfw/docs/input.dox
FILE: ../../../third_party/glfw/docs/internal.dox
FILE: ../../../third_party/glfw/docs/intro.dox
FILE: ../../../third_party/glfw/docs/main.dox
FILE: ../../../third_party/glfw/docs/monitor.dox
FILE: ../../../third_party/glfw/docs/moving.dox
FILE: ../../../third_party/glfw/docs/news.dox
FILE: ../../../third_party/glfw/docs/quick.dox
FILE: ../../../third_party/glfw/docs/spaces.svg
FILE: ../../../third_party/glfw/docs/vulkan.dox
FILE: ../../../third_party/glfw/docs/window.dox
FILE: ../../../third_party/glfw/include/GLFW/glfw3.h
FILE: ../../../third_party/glfw/include/GLFW/glfw3native.h
FILE: ../../../third_party/glfw/src/cocoa_monitor.m
FILE: ../../../third_party/glfw/src/context.c
FILE: ../../../third_party/glfw/src/egl_context.c
FILE: ../../../third_party/glfw/src/egl_context.h
FILE: ../../../third_party/glfw/src/glfw3.pc.in
FILE: ../../../third_party/glfw/src/glfw3Config.cmake.in
FILE: ../../../third_party/glfw/src/glx_context.c
FILE: ../../../third_party/glfw/src/glx_context.h
FILE: ../../../third_party/glfw/src/init.c
FILE: ../../../third_party/glfw/src/input.c
FILE: ../../../third_party/glfw/src/internal.h
FILE: ../../../third_party/glfw/src/linux_joystick.c
FILE: ../../../third_party/glfw/src/monitor.c
FILE: ../../../third_party/glfw/src/posix_time.c
FILE: ../../../third_party/glfw/src/posix_time.h
FILE: ../../../third_party/glfw/src/posix_tls.c
FILE: ../../../third_party/glfw/src/posix_tls.h
FILE: ../../../third_party/glfw/src/vulkan.c
FILE: ../../../third_party/glfw/src/wgl_context.c
FILE: ../../../third_party/glfw/src/wgl_context.h
FILE: ../../../third_party/glfw/src/win32_init.c
FILE: ../../../third_party/glfw/src/win32_joystick.c
FILE: ../../../third_party/glfw/src/win32_monitor.c
FILE: ../../../third_party/glfw/src/win32_platform.h
FILE: ../../../third_party/glfw/src/win32_time.c
FILE: ../../../third_party/glfw/src/win32_tls.c
FILE: ../../../third_party/glfw/src/win32_window.c
FILE: ../../../third_party/glfw/src/x11_init.c
FILE: ../../../third_party/glfw/src/x11_monitor.c
FILE: ../../../third_party/glfw/src/x11_platform.h
FILE: ../../../third_party/glfw/src/x11_window.c
FILE: ../../../third_party/glfw/src/xkb_unicode.c
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/cocoa_init.m
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/cocoa_init.m
FILE: ../../../third_party/glfw/src/cocoa_platform.h
FILE: ../../../third_party/glfw/src/cocoa_time.c
FILE: ../../../third_party/glfw/src/cocoa_window.m
FILE: ../../../third_party/glfw/src/nsgl_context.h
FILE: ../../../third_party/glfw/src/nsgl_context.m
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.h
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/cocoa_joystick.h
FILE: ../../../third_party/glfw/src/win32_joystick.h
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.m
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/cocoa_joystick.m
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/glfw_config.h.in
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/glfw_config.h.in
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/linux_joystick.h
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/linux_joystick.h
FILE: ../../../third_party/glfw/src/wl_init.c
FILE: ../../../third_party/glfw/src/wl_monitor.c
FILE: ../../../third_party/glfw/src/wl_platform.h
FILE: ../../../third_party/glfw/src/wl_window.c
FILE: ../../../third_party/glfw/src/xkb_unicode.h
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/mir_init.c
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/mir_init.c
FILE: ../../../third_party/glfw/src/mir_monitor.c
FILE: ../../../third_party/glfw/src/mir_platform.h
FILE: ../../../third_party/glfw/src/mir_window.c
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: glfw
ORIGIN: ../../../third_party/glfw/src/window.c
TYPE: LicenseType.zlib
FILE: ../../../third_party/glfw/src/window.c
----------------------------------------------------------------------------------------------------
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.
====================================================================================================

====================================================================================================
LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/COPYING
Expand Down Expand Up @@ -19167,4 +18869,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 319
Total license count: 311
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
View file
@@ -1,2 +1,2 @@
Signature: f2113ac67466eb24d34e9f41c3c59e17
Signature: e7b89482e4ea9fef22a33ad9fcc34961

0 comments on commit d93f23a

Please sign in to comment.