From fef9174dc1c07419d7ec271bd9f891cc24978864 Mon Sep 17 00:00:00 2001 From: Joao da Silva Date: Sun, 13 Feb 2022 11:25:05 +0100 Subject: [PATCH] Updated dependencies. ANGLE to HEAD. Skia to HEAD. v8 to 10.0.124. libuv to 1.43.0. GLFW to 3.3.6. --- .gclient | 129 +++++++++++++------------------------------------------ 1 file changed, 30 insertions(+), 99 deletions(-) diff --git a/.gclient b/.gclient index caa0e924..17e08129 100644 --- a/.gclient +++ b/.gclient @@ -1,143 +1,74 @@ vars = { 'glfw_git': 'https://github.com/glfw/glfw.git', - # Tag 3.3.5. Using commit hash to support gclient --no-history. - 'glfw_commit': 'd3b73abba0cab8cbb2a638151477f54d8502a07e', + # Tag 3.3.6. Using commit hash to support gclient --no-history. + 'glfw_commit': '7d5a16ce714f0b5f4efa3262de22e4d948851525', # Update skia_deps below when the Skia version is updated. 'skia_git': 'https://skia.googlesource.com/skia.git', - 'skia_commit': '0f253afb724ee9f2c4424463893727c8b3196973', + 'skia_commit': 'a63d89740ca8ab8572576d0ca07ab98201fe92d8', # Update v8_deps below when the v8 version is updated. 'v8_git': 'https://chromium.googlesource.com/v8/v8.git', - # Tag 9.8.146. Using commit hash to support gclient --no-history. - 'v8_commit': '8337eb615b587f52a501b2a815fdcb39c4fa0584', + # Tag 10.0.124. Using commit hash to support gclient --no-history. + 'v8_commit': '7d77940127204f858561c10b8aba06c78b1dcd29', 'libuv_git': 'https://github.com/libuv/libuv.git', - # Tag v1.42.0. Using commit hash to support gclient --no-history. - 'libuv_commit': '6ce14710da7079eb248868171f6343bc409ea3a4', + # Tag v1.43.0. Using commit hash to support gclient --no-history. + 'libuv_commit': '988f2bfc4defb9a85a536a3e645834c161143ee0', 'angle_git': 'https://github.com/google/angle.git', - 'angle_commit': '9bf5716c84d9c3bc8a3e47c9f5452d90b4f9898c', + 'angle_commit': '06edae72ba692eaf34aaca2d9a96168b5c13d2b2', 'chromium_git': 'https://chromium.googlesource.com', } # ANGLE dependencies. Copied from libraries/angle/DEPS. angle_deps = { - 'build': 'https://chromium.googlesource.com/chromium/src/build.git@c033fc477ff9e5a9513a6df537f6de4ba67eceec', - 'testing': 'https://chromium.googlesource.com/chromium/src/testing@df87133fcb31f773a418c933d372ea7262de95ca', + 'build': 'https://chromium.googlesource.com/chromium/src/build.git@3408ba573710d8e87858cc8297a07b9460b513c6', + 'testing': 'https://chromium.googlesource.com/chromium/src/testing@3ff9ded26319369788b1c025154f587271c15c89', 'tools/protoc_wrapper': 'https://chromium.googlesource.com/chromium/src/tools/protoc_wrapper@c16b0dc8db35e95a04eaef88079237634c7f20c2', - 'third_party/abseil-cpp': 'https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@ce12c7a75aa6aa689667e66189d9f0a42a5ccf08', - 'third_party/catapult': 'https://chromium.googlesource.com/catapult.git@d90eeee99383928afa92d6960ad9d3b5f51f8b76', + 'third_party/abseil-cpp': 'https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@47dfacfcce5673b4bab6121b30c801550d78c577', + 'third_party/catapult': 'https://chromium.googlesource.com/catapult.git@7b5325d761f0819d2e774df3e21ebe6e340342ac', 'third_party/jsoncpp': 'https://chromium.googlesource.com/chromium/src/third_party/jsoncpp@30a6ac108e24dabac7c2e0df4d33d55032af4ee7', 'third_party/googletest': 'https://chromium.googlesource.com/chromium/src/third_party/googletest@17bbed2084d3127bd7bcd27283f18d7a5861bea8', 'third_party/libjpeg_turbo': 'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@02959c3ee17abacfd1339ec22ea93301292ffd56', 'third_party/nasm': 'https://chromium.googlesource.com/chromium/deps/nasm.git@9215e8e1d0fe474ffd3e16c1a07a0f97089e6224', - 'third_party/protobuf': 'https://chromium.googlesource.com/chromium/src/third_party/protobuf@2dc9e853e138fdec5d56bf750c180ebb2365639e', - 'third_party/SwiftShader': 'https://swiftshader.googlesource.com/SwiftShader@518c5780ac4fdc4a7957e9bd2727a6cc4df54750', + 'third_party/protobuf': 'https://chromium.googlesource.com/chromium/src/third_party/protobuf@d29d689c1d9446e0623af9693fe1945ecfab9c45', + 'third_party/SwiftShader': 'https://swiftshader.googlesource.com/SwiftShader@cbd31d271e4cedc709192d02b946aee9cdfe4653', 'third_party/vulkan_memory_allocator': 'https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@5e49f57a6e71a026a54eb42e366de09a4142d24e', - 'third_party/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@fc5cfd78a357d5bb7735a58f383634faaafe706a', - 'tools/clang': 'https://chromium.googlesource.com/chromium/src/tools/clang.git@00a9400ecf1021b2414c9a40549b5d31049e6443', + 'third_party/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@dd9a1330e5aeb2f194d711746a03e01391d6f17c', + 'tools/clang': 'https://chromium.googlesource.com/chromium/src/tools/clang.git@b9894ca3bc6596a03cb033ddbdd36990f11b8ce7', - 'third_party/vulkan-deps': 'https://chromium.googlesource.com/vulkan-deps@a19b5047ffcafc95fcba3f39e53f229acca6debc', - 'third_party/vulkan-deps/glslang/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang@81cc10a498b25a90147cccd6e8939493c1e9e20e', - 'third_party/vulkan-deps/spirv-cross/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@53d94a982e1d654515b44db5391de37f85489204', + # Copied from libraries/angle/third_party/vulkan-deps/DEPS. + 'third_party/vulkan-deps': 'https://chromium.googlesource.com/vulkan-deps@3a6f074dbd38e318d7b36551276c0dca5870808b', + 'third_party/vulkan-deps/glslang/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang@16e3b403aabc7681af428792ddbbfa8ae556b5bb', + 'third_party/vulkan-deps/spirv-cross/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@1a36968e5d92e08ba38335ad00701da21c627a13', 'third_party/vulkan-deps/spirv-headers/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers@b42ba6d92faf6b4938e6f22ddd186dbdacc98d78', - 'third_party/vulkan-deps/spirv-tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools@a73e724359a274d7cf4f4248eba5be1e7764fbfd', + 'third_party/vulkan-deps/spirv-tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools@7fa9e746ef815b27f7747c9bab2689c113fb33d9', 'third_party/vulkan-deps/vulkan-headers/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers@1dace16d8044758d32736eb59802d171970e9448', - 'third_party/vulkan-deps/vulkan-loader/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader@8aad559a09388ceb5b968af64a2b965d3886e5a0', - 'third_party/vulkan-deps/vulkan-tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools@b69bea34466e746f919388ff88a783fae64ca43a', - 'third_party/vulkan-deps/vulkan-validation-layers/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers@a6c1ddca49331d8addde052554487180ee8aec13', + 'third_party/vulkan-deps/vulkan-loader/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader@cdebcc4ee08a8e18521cb0486db7201b8793bd4b', + 'third_party/vulkan-deps/vulkan-tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools@bb32aa13d4920261b5086219028ef329605d0126', + 'third_party/vulkan-deps/vulkan-validation-layers/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers@54c295b067de5531867a842b4b3579ee1d3c8545', } # Skia dependencies. Copied from libraries/skia/DEPS. skia_deps = { - #"buildtools" : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75", - #"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@fe42ac4df49fcd8b1e371276972b201f78a9a00d", - #"third_party/externals/brotli" : "https://skia.googlesource.com/external/github.com/google/brotli.git@e61745a6b7add50d380cfd7d3883dd6c62fc2c71", - #"third_party/externals/d3d12allocator" : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b", - # Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting. - # When the Dawn revision is updated these should be updated from the Dawn DEPS as well. - #"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@b6c1a51775ae80695eb6c474691d02366d4eb7ad", - #"third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@ee69aa00ee8536f61db6a451f3858745cf587de6", - #"third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0944e71f4b2cb9a871bcbe353f95e889b64a611a", - #"third_party/externals/tint" : "https://dawn.googlesource.com/tint@f71784fc2b2a4b0ae020a1bfdcc6da95ead7ad79", - #"third_party/externals/abseil-cpp" : "https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@789af048b388657987c59d4da406859034fe310f", - #"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123", - #"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae", "third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee", - #"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@cff026d41599945498044d2f4dcc0e610ffb6929", - #"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@3160789701463bcd822c26010da4de33c92c85d9", - #"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f", - #"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@9418dcb69355558f70de260483424412c5ca2fce", - #"third_party/externals/libgifcodec" : "https://skia.googlesource.com/libgifcodec@fd59fa92a0c86788dcdd84d091e1ce81eda06a77", "third_party/externals/libjpeg-turbo" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20", "third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@386707c6d19b974ca2e3db7f5c61873813c6fe44", - "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf", - #"third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d", - #"third_party/externals/oboe" : "https://chromium.googlesource.com/external/github.com/google/oboe.git@b02a12d1dd821118763debec6b83d00a8a0ee419", - #"third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553", - #"third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406", - #"third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b55ff303ea2f9e26702b514cf6a3196a2e3e2974", - #"third_party/externals/spirv-cross" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@0e2880ab990e79ce6cc8c79c219feda42d98b1e8", - #"third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@814e728b30ddd0f4509233099a3ad96fd4318c07", - #"third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@4b092d2ab81854e61632bdd1e658907f0071c37e", - #"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@a465cca8ec8dffa0a308731e3aec9a26c9215f6c", - #"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", - #"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@600cd96cf47788ee3a74b40a6028b035c9fd6a61", + "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@69c7f16111ec582bf1e7cb4d0d4f8d127e28a715", "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73", } # v8 dependencies. Copied from libraries/v8/DEPS. v8_deps = { - 'base/trace_event/common' : 'https://chromium.googlesource.com/chromium/src/base/trace_event/common.git@7f36dbc19d31e2aad895c60261ca8f726442bfbb', - 'build' : 'https://chromium.googlesource.com/chromium/src/build.git@746224dc80909d8428c2d37ab26e4a4e48168b11', - #'buildtools' : 'https://chromium.googlesource.com/chromium/src/buildtools.git@075dd7e22837a69189003e4fa84499acf63188cf', - #'buildtools/clang_format/script' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@99876cacf78329e5f99c244dbe42ccd1654517a0', - #'buildtools/third_party/libc++/trunk' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@79a2e924d96e2fc1e4b937c42efd08898fa472d7', - #'buildtools/third_party/libc++abi/trunk' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@89f2e82120461d34098edd216e57aa743f441107', - #'buildtools/third_party/libunwind/trunk' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@0f447a31381e0343f8b06c3f7049c076ddfbb1fc', - #'test/benchmarks/data' : 'https://chromium.googlesource.com/v8/deps/third_party/benchmarks.git@05d7188267b4560491ff9155c5ee13e207ecd65f', - #'test/mozilla/data' : 'https://chromium.googlesource.com/v8/deps/third_party/mozilla-tests.git@f6c578a10ea707b1a8ab0b88943fe5115ce2b9be', - #'test/test262/data' : 'https://chromium.googlesource.com/external/github.com/tc39/test262.git@4b7f8b49cc07a89c093475f284ef112f26a8529f', - #'test/test262/harness' : 'https://chromium.googlesource.com/external/github.com/test262-utils/test262-harness-py.git@278bcfaed0dcaa13936831fb1769d15e7c1e3b2b', - #'third_party/depot_tools' : 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@3e68015b7f43914a60492618c3a010c5812662dc', - #'third_party/google_benchmark/src' : 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@fd258bbd131552beb2483b960a5e4b69553fdacf', - 'third_party/googletest/src' : 'https://chromium.googlesource.com/external/github.com/google/googletest.git@1b2606425c4040cacadaa22689423ec0a29f316d', - #'third_party/icu' : 'https://chromium.googlesource.com/chromium/deps/icu.git@edf883ad2db9c723b058a6a17a146d68d6343143', - #'third_party/instrumented_libraries' : 'https://chromium.googlesource.com/chromium/src/third_party/instrumented_libraries.git@e09c4b66b6e87116eb190651421f1a6e2f3b9c52', + 'base/trace_event/common' : 'https://chromium.googlesource.com/chromium/src/base/trace_event/common.git@d115b033c4e53666b535cbd1985ffe60badad082', + 'build' : 'https://chromium.googlesource.com/chromium/src/build.git@a00adb7f311fb1320eab01d47f047a41a3896478', + 'third_party/googletest/src' : 'https://chromium.googlesource.com/external/github.com/google/googletest.git@0e402173c97aea7a00749e825b194bfede4f2e45', 'third_party/jinja2' : 'https://chromium.googlesource.com/chromium/src/third_party/jinja2.git@ee69aa00ee8536f61db6a451f3858745cf587de6', - #'third_party/jsoncpp/source' : 'https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@9059f5cad030ba11d37818847443a53918c327b1', - #'third_party/logdog/logdog' : 'https://chromium.googlesource.com/infra/luci/luci-py/client/libs/logdog@17ec234f823f7bff6ada6584fdbbee9d54b8fc58', 'third_party/markupsafe' : 'https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git@1b882ef6372b58bfd55a3285f37ed801be9137cd', - #'third_party/perfetto' : 'https://android.googlesource.com/platform/external/perfetto.git@aa4385bc5997ecad4c633885e1b331b1115012fb', - #'third_party/protobuf' : 'https://chromium.googlesource.com/external/github.com/google/protobu@6a59a2ad1f61d9696092f79b6d74368b4d7970a3', - 'third_party/zlib' : 'https://chromium.googlesource.com/chromium/src/third_party/zlib.git@efd9399ae01364926be2a38946127fdf463480db', - 'tools/clang' : 'https://chromium.googlesource.com/chromium/src/tools/clang.git@16279ec9aa9650adc022985ea0831c9ca0c62fd9', - #'tools/clang/dsymutil': { - # 'packages': [ - # { - # 'package': 'chromium/llvm-build-tools/dsymutil', - # 'version': 'M56jPzDv1620Rnm__jTMYS62Zi8rxHVq7yw0qeBFEgkC', - # } - # ], - # 'condition': 'checkout_mac', - # 'dep_type': 'cipd', - #}, - #'tools/luci-go': { - # 'packages': [ - # { - # 'package': 'infra/tools/luci/isolate/${{platform}}', - # 'version': Var('luci_go'), - # }, - # { - # 'package': 'infra/tools/luci/swarming/${{platform}}', - # 'version': Var('luci_go'), - # }, - # ], - # 'condition': 'host_cpu != "s390" and host_os != "aix"', - # 'dep_type': 'cipd', - #}, + 'third_party/zlib' : 'https://chromium.googlesource.com/chromium/src/third_party/zlib.git@d8f49e6ae1efe8618a088f0c872df2b1edf16436', + 'tools/clang' : 'https://chromium.googlesource.com/chromium/src/tools/clang.git@b9894ca3bc6596a03cb033ddbdd36990f11b8ce7', } solutions = [