diff --git a/ports/dawn/001-fix-windows-build.patch b/ports/dawn/001-fix-windows-build.patch index 436d498dc528e1..4b4278e75bba64 100644 --- a/ports/dawn/001-fix-windows-build.patch +++ b/ports/dawn/001-fix-windows-build.patch @@ -1,17 +1,14 @@ diff --git a/src/cmake/DawnLibrary.cmake b/src/cmake/DawnLibrary.cmake -index f80426804a..e9fbeaf34d 100644 +index f80426804a..44f4535c63 100644 --- a/src/cmake/DawnLibrary.cmake +++ b/src/cmake/DawnLibrary.cmake -@@ -184,9 +184,9 @@ function(dawn_install_target name) +@@ -184,9 +184,6 @@ function(dawn_install_target name) get_target_property(target_type "${name}" TYPE) # Only shared libraries and executables generate PDB files through the linker # Static libraries are created by the archiver and don't generate PDB files - if ((target_type STREQUAL "SHARED_LIBRARY") OR (target_type STREQUAL "EXECUTABLE")) - install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) - endif() -+ #if ((target_type STREQUAL "SHARED_LIBRARY") OR (target_type STREQUAL "EXECUTABLE")) -+ # install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) -+ #endif() endif (MSVC) # Automatically determine where each header should go based on its subdirectory in the include dir. diff --git a/ports/dawn/003-fix-d3d11.patch b/ports/dawn/003-fix-d3d11.patch index bf2091526eb8bf..b1e4a7c108b8ba 100644 --- a/ports/dawn/003-fix-d3d11.patch +++ b/ports/dawn/003-fix-d3d11.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5826595d6f..9521fcf6a7 100644 +index 2092a42fc6..596f55d5f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -214,6 +214,12 @@ else() +@@ -222,6 +222,12 @@ else() set(TINT_DEFAULT_GLSL OFF) endif() @@ -15,7 +15,7 @@ index 5826595d6f..9521fcf6a7 100644 option(TINT_ENABLE_INSTALL "Enable install step for Tint libraries" OFF) option(TINT_BUILD_CMD_TOOLS "Build the Tint command line tools" ON) -@@ -227,7 +233,7 @@ option(TINT_BUILD_SPV_READER "Build the SPIR-V input reader" ${DAWN_ENABLE_VULKA +@@ -235,7 +241,7 @@ option(TINT_BUILD_SPV_READER "Build the SPIR-V input reader" ${DAWN_ENABLE_VULKA option(TINT_BUILD_WGSL_READER "Build the WGSL input reader" ON) option(TINT_BUILD_GLSL_WRITER "Build the GLSL output writer" ${TINT_DEFAULT_GLSL}) option(TINT_BUILD_GLSL_VALIDATOR "Build the GLSL output validator" ON) diff --git a/ports/dawn/004-deps.patch b/ports/dawn/004-deps.patch index 769200090f6043..1d98122f7b10d8 100644 --- a/ports/dawn/004-deps.patch +++ b/ports/dawn/004-deps.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 59e3eab590..59404a561d 100644 +index 596f55d5f2..3ded3daa67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -466,6 +466,11 @@ set(TINT_SPIRV_TOOLS_DIR ${DAWN_SPIRV_TOOLS_DIR}) +@@ -471,6 +471,11 @@ set(TINT_SPIRV_TOOLS_DIR ${DAWN_SPIRV_TOOLS_DIR}) ################################################################################ # Run on all subdirectories ################################################################################ @@ -60,10 +60,10 @@ index 8bfeda55bc..a0f9858530 100644 + include ("${CMAKE_CURRENT_LIST_DIR}/DawnTargets.cmake") diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt -index 0c5dc4dbba..bf518be937 100644 +index c96d5a24d9..472a86d29f 100644 --- a/src/dawn/native/CMakeLists.txt +++ b/src/dawn/native/CMakeLists.txt -@@ -651,11 +651,17 @@ if ((DAWN_ENABLE_OPENGL OR DAWN_ENABLE_VULKAN) AND DAWN_ENABLE_SPIRV_VALIDATION) +@@ -650,11 +650,17 @@ if ((DAWN_ENABLE_OPENGL OR DAWN_ENABLE_VULKAN) AND DAWN_ENABLE_SPIRV_VALIDATION) endif() if (DAWN_ENABLE_OPENGL) diff --git a/ports/dawn/005-bsd-support.patch b/ports/dawn/005-bsd-support.patch index ecbe73c31eff89..d1dc22c9504480 100644 --- a/ports/dawn/005-bsd-support.patch +++ b/ports/dawn/005-bsd-support.patch @@ -1,5 +1,5 @@ diff --git a/include/dawn/native/VulkanBackend.h b/include/dawn/native/VulkanBackend.h -index 201bc324..3221ad2e 100644 +index 201bc3242f..3221ad2e37 100644 --- a/include/dawn/native/VulkanBackend.h +++ b/include/dawn/native/VulkanBackend.h @@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExportInfo { @@ -12,7 +12,7 @@ index 201bc324..3221ad2e 100644 // Common properties of external images represented by FDs. On successful import the file // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/src/dawn/common/Platform.h b/src/dawn/common/Platform.h -index b4ac6100..cbc5c7b8 100644 +index b4ac61004d..cbc5c7b8b5 100644 --- a/src/dawn/common/Platform.h +++ b/src/dawn/common/Platform.h @@ -60,6 +60,11 @@ @@ -28,10 +28,10 @@ index b4ac6100..cbc5c7b8 100644 #define DAWN_PLATFORM_IS_LINUX 1 #define DAWN_PLATFORM_IS_POSIX 1 diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp -index 058cbecc..9bae2d27 100644 +index 783a15ab55..29405d2003 100644 --- a/src/dawn/native/vulkan/BackendVk.cpp +++ b/src/dawn/native/vulkan/BackendVk.cpp -@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftshader.dylib"; +@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftshader.dylib"; #endif #if DAWN_PLATFORM_IS(LINUX) diff --git a/ports/dawn/008-wrong-dxcapi-include.patch b/ports/dawn/008-wrong-dxcapi-include.patch index ae7c8b4c4f326c..bb5910f5ad962d 100644 --- a/ports/dawn/008-wrong-dxcapi-include.patch +++ b/ports/dawn/008-wrong-dxcapi-include.patch @@ -1,13 +1,13 @@ -diff --git a/src/tint/lang/hlsl/validate/validate.cc b/src/tint/lang/hlsl/validate/validate.cc -index 696b1a4c5e..7b2c0c666d 100644 ---- a/src/tint/lang/hlsl/validate/validate.cc -+++ b/src/tint/lang/hlsl/validate/validate.cc -@@ -50,7 +50,7 @@ TINT_BEGIN_DISABLE_ALL_WARNINGS(); - // # Use UUID emulation with clang to avoid compiling with ms-extensions - #define __EMULATE_UUID - #endif --#include "dxc/dxcapi.h" -+#include - TINT_END_DISABLE_ALL_WARNINGS(); - - // Disable warnings about old-style casts which result from using +diff --git a/src/tint/lang/hlsl/validate/validate.cc b/src/tint/lang/hlsl/validate/validate.cc +index 21e6b9c6dc..00cdbfe95c 100644 +--- a/src/tint/lang/hlsl/validate/validate.cc ++++ b/src/tint/lang/hlsl/validate/validate.cc +@@ -51,7 +51,7 @@ TINT_BEGIN_DISABLE_ALL_WARNINGS(); + // # Use UUID emulation with clang to avoid compiling with ms-extensions + #define __EMULATE_UUID + #endif +-#include "dxc/dxcapi.h" ++#include "dxcapi.h" + TINT_END_DISABLE_ALL_WARNINGS(); + + // Disable warnings about old-style casts which result from using diff --git a/ports/dawn/009-fix-tint-install.patch b/ports/dawn/009-fix-tint-install.patch index 474ce2b47ac9eb..9aac0336ffd75d 100644 --- a/ports/dawn/009-fix-tint-install.patch +++ b/ports/dawn/009-fix-tint-install.patch @@ -1,8 +1,18 @@ diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt -index 84947a15ce..1ccf20e23c 100644 +index 446c0d8b29..573c615799 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt -@@ -741,3 +741,9 @@ if (TINT_ENABLE_INSTALL) +@@ -415,7 +415,9 @@ function(tint_add_target TARGET KIND) + elseif(${KIND} STREQUAL cmd) + add_executable(${TARGET}) + tint_default_compile_options(${TARGET}) ++ if(TINT_ENABLE_INSTALL) + install(TARGETS "${TARGET}") ++ endif() + elseif(${KIND} STREQUAL test_cmd) + add_executable(${TARGET}) + tint_test_cmd_compile_options(${TARGET}) +@@ -744,3 +746,9 @@ if (TINT_ENABLE_INSTALL) install(FILES ${TINT_ROOT_SOURCE_DIR}/${TINT_HEADER_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/src/tint/${TINT_HEADER_DIR}) endforeach () endif() diff --git a/ports/dawn/010-fix-glslang.patch b/ports/dawn/010-fix-glslang.patch index 664f481e86a58f..d8171f0ef576ec 100644 --- a/ports/dawn/010-fix-glslang.patch +++ b/ports/dawn/010-fix-glslang.patch @@ -1,8 +1,8 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index f7812f211e..d58d6648c1 100644 +index 68644c04f6..c1ca58b3e2 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -120,6 +120,12 @@ if (EMSCRIPTEN) +@@ -122,6 +122,12 @@ if (EMSCRIPTEN) return() endif() diff --git a/ports/dawn/011-fix-dxc.patch b/ports/dawn/011-fix-dxc.patch index b4493e4e0f40bb..a4caefc7e91fe0 100644 --- a/ports/dawn/011-fix-dxc.patch +++ b/ports/dawn/011-fix-dxc.patch @@ -1,8 +1,8 @@ diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt -index 0c5dc4dbba..9f6a8a0c93 100644 +index 472a86d29f..42a2943e1a 100644 --- a/src/dawn/native/CMakeLists.txt +++ b/src/dawn/native/CMakeLists.txt -@@ -950,7 +950,6 @@ if (DAWN_ENABLE_D3D12) +@@ -963,7 +963,6 @@ if (DAWN_ENABLE_D3D12) if (DAWN_USE_BUILT_DXC) target_compile_definitions(dawn_native PRIVATE "DAWN_USE_BUILT_DXC") target_compile_definitions(dawn_native_objects PRIVATE "DAWN_USE_BUILT_DXC") @@ -10,7 +10,7 @@ index 0c5dc4dbba..9f6a8a0c93 100644 endif() endif() -@@ -1051,7 +1050,7 @@ endif () +@@ -1065,7 +1064,7 @@ endif () # They happen because dxcompiler is declared a shared library and bundle_libraries # doesn't work well with shared libs if (DAWN_USE_BUILT_DXC) @@ -20,10 +20,10 @@ index 0c5dc4dbba..9f6a8a0c93 100644 # Copy d3dcompiler_47.dll from Windows SDK when not using system component loading diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index e9dde19a4a..5d64975fb6 100644 +index c1ca58b3e2..e2b9faf26f 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -361,7 +361,7 @@ function(AddSubdirectoryDXC) +@@ -366,7 +366,7 @@ function(AddSubdirectoryDXC) endfunction() if (DAWN_USE_BUILT_DXC) diff --git a/ports/dawn/portfile.cmake b/ports/dawn/portfile.cmake index a70f44e45e971e..921e66a37d29f5 100644 --- a/ports/dawn/portfile.cmake +++ b/ports/dawn/portfile.cmake @@ -2,7 +2,7 @@ if (VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/google/dawn/releases/download/v${VERSION}/emdawnwebgpu_pkg-v${VERSION}.zip" FILENAME "emdawnwebgpu_pkg-v${VERSION}.zip" - SHA512 B54650FE7B4D8653DAB70E892DEADA5C7DDC9EF0D5655EED67FD5A70913643B6CA2BD5A52A961EC975E5559D8683974DEE3B73FC1228F6D62159B781A0056CDA + SHA512 f6f683c913d9a4e66ffcf85fe3a352d2175aba060bf036cf504e0494edcaaa27bd288cf37b9a584a9fc383b832fe2cad42a7644fecf73356dec4999f3656bcb5 ) vcpkg_extract_source_archive( SOURCE_PATH @@ -11,16 +11,22 @@ if (VCPKG_TARGET_IS_EMSCRIPTEN) 000-fix-emdawnwebgpu.patch ) set(VCPKG_BUILD_TYPE release) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/DawnConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/webgpu/include" DESTINATION "${CURRENT_PACKAGES_DIR}") file(INSTALL "${SOURCE_PATH}/webgpu_cpp/include" DESTINATION "${CURRENT_PACKAGES_DIR}") file(INSTALL "${SOURCE_PATH}/webgpu/src" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" PATTERN "LICENSE" EXCLUDE) file(INSTALL "${SOURCE_PATH}/emdawnwebgpu.port.py" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + + # cmake config file + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/DawnConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + vcpkg_cmake_config_fixup() + + # pkgconfig file set(DAWN_PKGCONFIG_CFLAGS "--use-port=\${prefix}/share/${PORT}/emdawnwebgpu.port.py") set(DAWN_PKGCONFIG_LIBS "--use-port=\${prefix}/share/${PORT}/emdawnwebgpu.port.py") set(DAWN_PKGCONFIG_REQUIRES "") configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial_webgpu_dawn.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/unofficial_webgpu_dawn.pc" @ONLY) vcpkg_fixup_pkgconfig() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/webgpu/src/LICENSE" "${SOURCE_PATH}/webgpu_cpp/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") return() @@ -30,7 +36,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/dawn REF "v${VERSION}" - SHA512 7F0DF70609FEC78E9D94E36D0DB549D0B759B993D172BC61B233D80EB295060813D7A532496591E60A44B182EBD3CB89CBACB3254CCD0C1695351DD839D8ABBA + SHA512 ac54f478b77fcdd0a7f0e52a2b398e1d6902e1cae16621f0dd02c084b44939f2d40c2193c3147c6276f11a1efeaa563cb0920eea9a0de3a7e8072ea6fa630b66 HEAD_REF master PATCHES 001-fix-windows-build.patch @@ -93,13 +99,13 @@ checkout_in_path( checkout_in_path( "${SOURCE_PATH}/third_party/spirv-headers/src" "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - "b824a462d4256d720bebb40e78b9eb8f78bbb305" + "04f10f650d514df88b76d25e83db360142c7b174" ) checkout_in_path( "${SOURCE_PATH}/third_party/spirv-tools/src" "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - "f410b3c178740f9f5bd28d5b22a71d4bc10acd49" + "d4671f690ac42f196795272114daadc5088967ce" PATCHES # Dawn sets SPIRV_WERROR to OFF when building SPIRV-Tools, but https://github.com/KhronosGroup/SPIRV-Tools/commit/337fdb6a284fe7f7e374a14271f8e20e579f3263 ignores that CMake variable and forces /WX 006-msvc-spirv-tools-disable-warnaserror.patch @@ -108,7 +114,7 @@ checkout_in_path( checkout_in_path( "${SOURCE_PATH}/third_party/webgpu-headers/src" "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" - "12c1d34e7464cac58cc41a24aeee1d48a2f21b74" + "0bfcdc4f487023d85e33597de0a94fc523e30fca" ) vcpkg_find_acquire_program(PYTHON3) @@ -119,10 +125,6 @@ else() set(DAWN_BUILD_MONOLITHIC_LIBRARY "SHARED") endif() -# DAWN_BUILD_MONOLITHIC_LIBRARY SHARED/STATIC requires BUILD_SHARED_LIBS=OFF -set(VCPKG_LIBRARY_LINKAGE_BACKUP ${VCPKG_LIBRARY_LINKAGE}) -set(VCPKG_LIBRARY_LINKAGE static) - vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -142,9 +144,14 @@ if(DAWN_ENABLE_D3D11 OR DAWN_ENABLE_D3D12) set(DAWN_USE_BUILT_DXC ON) endif() +# DAWN_BUILD_MONOLITHIC_LIBRARY SHARED/STATIC requires BUILD_SHARED_LIBS=OFF +set(VCPKG_LIBRARY_LINKAGE_BACKUP ${VCPKG_LIBRARY_LINKAGE}) +set(VCPKG_LIBRARY_LINKAGE static) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DPython3_EXECUTABLE="${PYTHON3}" -DDAWN_BUILD_MONOLITHIC_LIBRARY=${DAWN_BUILD_MONOLITHIC_LIBRARY} -DDAWN_ENABLE_INSTALL=ON @@ -154,33 +161,26 @@ vcpkg_cmake_configure( -DDAWN_BUILD_TESTS=OFF -DTINT_BUILD_TESTS=OFF -DTINT_ENABLE_INSTALL=OFF - -DTINT_BUILD_CMD_TOOLS=${TINT_BUILD_CMD_TOOLS} -DTINT_BUILD_WGSL_READER=ON -DTINT_BUILD_WGSL_WRITER=ON -DTINT_BUILD_SPV_READER=OFF -DTINT_BUILD_SPV_WRITER=OFF -DDAWN_ENABLE_NULL=ON - -DDAWN_ENABLE_D3D11=${DAWN_ENABLE_D3D11} - -DDAWN_ENABLE_D3D12=${DAWN_ENABLE_D3D12} - -DDAWN_ENABLE_DESKTOP_GL=${DAWN_ENABLE_DESKTOP_GL} - -DDAWN_ENABLE_OPENGLES=${DAWN_ENABLE_OPENGLES} - -DDAWN_ENABLE_METAL=${DAWN_ENABLE_METAL} - -DDAWN_ENABLE_VULKAN=${DAWN_ENABLE_VULKAN} - -DDAWN_USE_WAYLAND=${DAWN_USE_WAYLAND} - -DDAWN_USE_X11=${DAWN_USE_X11} -DDAWN_USE_BUILT_DXC=${DAWN_USE_BUILT_DXC} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Dawn) +# Restore the original library linkage +set(VCPKG_LIBRARY_LINKAGE ${VCPKG_LIBRARY_LINKAGE_BACKUP}) + list(APPEND DAWN_ABSL_REQUIRES absl_flat_hash_set absl_flat_hash_map absl_inlined_vector absl_no_destructor absl_overload - absl_str_format_internal absl_strings absl_span absl_string_view @@ -216,9 +216,6 @@ if(TINT_BUILD_CMD_TOOLS) vcpkg_copy_tools(TOOL_NAMES tint AUTO_CLEAN) endif() -# Restore the original library linkage -set(VCPKG_LIBRARY_LINKAGE ${VCPKG_LIBRARY_LINKAGE_BACKUP}) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dawn/vcpkg.json b/ports/dawn/vcpkg.json index efb0a6a203bed4..1a9a33bf2d5c7b 100644 --- a/ports/dawn/vcpkg.json +++ b/ports/dawn/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dawn", - "version": "20251202.213730", - "port-version": 2, + "version": "20260201.182244", "description": "Dawn is an open-source and cross-platform implementation of the WebGPU standard.", "homepage": "https://dawn.googlesource.com/dawn", "license": "BSD-3-Clause", diff --git a/ports/skia/allow-disabling-lib-dl.patch b/ports/skia/allow-disabling-lib-dl.patch index 94cd3e14e28c25..6b8b66d27c22a6 100644 --- a/ports/skia/allow-disabling-lib-dl.patch +++ b/ports/skia/allow-disabling-lib-dl.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 306bfffaf8..1632feccd4 100644 +index def43b13f1..5863050248 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1740,7 +1740,9 @@ skia_component("skia") { +@@ -1933,7 +1933,9 @@ skia_component("skia") { if (is_ios) { sources += [ "src/ports/SkOSFile_ios.h" ] } @@ -14,7 +14,7 @@ index 306bfffaf8..1632feccd4 100644 if (is_android) { diff --git a/gn/skia.gni b/gn/skia.gni -index bea9cd832a..56a2125ea9 100644 +index 13fbcce6ca..9ed1ea066e 100644 --- a/gn/skia.gni +++ b/gn/skia.gni @@ -105,6 +105,8 @@ declare_args() { diff --git a/ports/skia/always-build-pathops.patch b/ports/skia/always-build-pathops.patch index 2a73317491f88a..95945247183e5a 100755 --- a/ports/skia/always-build-pathops.patch +++ b/ports/skia/always-build-pathops.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 2a04c9f..8d0e7ec 100644 +index 5863050248..4250e045d0 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1663,6 +1663,7 @@ skia_component("skia") { +@@ -1830,6 +1830,7 @@ skia_component("skia") { ":gpu", ":graphite", ":jpeg_encode", diff --git a/ports/skia/dawn.patch b/ports/skia/dawn.patch index 9bf920a371c9a6..52fad09d0bc476 100644 --- a/ports/skia/dawn.patch +++ b/ports/skia/dawn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index b45e6e6f05..bff5f26669 100644 +index 4250e045d0..e26e7be3a7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -15,7 +15,6 @@ if (defined(skia_settings)) { diff --git a/ports/skia/dont-use-response-file.patch b/ports/skia/dont-use-response-file.patch index 1ce9bfe5d22f13..45d2ce8cd9bcbd 100644 --- a/ports/skia/dont-use-response-file.patch +++ b/ports/skia/dont-use-response-file.patch @@ -1,5 +1,5 @@ diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn -index 8eace39..67d7b00 100644 +index 8eace3949b..67d7b00096 100644 --- a/gn/toolchain/BUILD.gn +++ b/gn/toolchain/BUILD.gn @@ -305,7 +305,7 @@ template("gcc_like_toolchain") { diff --git a/ports/skia/graphite.patch b/ports/skia/graphite.patch index 84e3d9e50803f7..e1f934b0838073 100644 --- a/ports/skia/graphite.patch +++ b/ports/skia/graphite.patch @@ -1,5 +1,5 @@ diff --git a/include/gpu/graphite/Recorder.h b/include/gpu/graphite/Recorder.h -index 6087473f78..18f832023d 100644 +index cfd486afe3..c97dca0d17 100644 --- a/include/gpu/graphite/Recorder.h +++ b/include/gpu/graphite/Recorder.h @@ -12,6 +12,7 @@ diff --git a/ports/skia/pdfsubsetfont-uwp.diff b/ports/skia/pdfsubsetfont-uwp.diff index cdeab2891985bf..ba68b01e76774a 100644 --- a/ports/skia/pdfsubsetfont-uwp.diff +++ b/ports/skia/pdfsubsetfont-uwp.diff @@ -3,9 +3,9 @@ index 307c4304a2..db723bcd42 100644 --- a/src/pdf/SkPDFSubsetFont.cpp +++ b/src/pdf/SkPDFSubsetFont.cpp @@ -111,6 +111,7 @@ sk_sp SkPDFSubsetFont(const SkTypeface& typeface, const SkPDFGlyphUse& g - + #else - + +#include "include/core/SkData.h" sk_sp SkPDFSubsetFont(const SkTypeface&, const SkPDFGlyphUse&) { return nullptr; diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 795ac103ad4ca8..68e4bb0792912f 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -3,11 +3,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/skia - REF "ee20d565acb08dece4a32e3f209cdd41119015ca" - SHA512 AFA54CB14B76E9B2F40498C5DAF93CEC951D12D7F3487DEBA6F8F94A66D046A5625561E1CCD65F2E9EF5E2FC1A3158C3DA4FB9658BCF268248A34C49DEA90D3A + REF "2ab8add5be2c46eb6238f4c217f6d6dbc9bccd23" + SHA512 c86873a4deb83b25805fd5c0a4ea10706ba454ee82901d7eae936287d8aa5758b8de5a2241d56ebd5f7053b0d2df23b21cbe9b9a6bba3cdd47ccf033114bde79 PATCHES # disable-dev-test.patch - skia-include-string.patch bentleyottmann-build.patch graphite.patch vulkan-headers.patch @@ -19,7 +18,6 @@ vcpkg_from_github( allow-disabling-lib-dl.patch always-build-pathops.patch skstrendswith-dllexport.patch - skpath-enable-edit-methods.patch # See SkPath section in https://github.com/google/skia/blob/chrome/m143/RELEASE_NOTES.md dawn.patch skcms-dllexport.patch ) @@ -67,12 +65,12 @@ declare_external_from_git(spirv-cross ) declare_external_from_git(spirv-headers URL "https://github.com/KhronosGroup/SPIRV-Headers.git" - REF "b824a462d4256d720bebb40e78b9eb8f78bbb305" + REF "babee77020ff82b571d723ce2c0262e2ec0ee3f1" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-tools URL "https://github.com/KhronosGroup/SPIRV-Tools.git" - REF "f410b3c178740f9f5bd28d5b22a71d4bc10acd49" + REF "65b2ace21293057714b7fa1e87bd764d3dcef305" LICENSE_FILE LICENSE ) declare_external_from_git(wuffs diff --git a/ports/skia/skia-include-string.patch b/ports/skia/skia-include-string.patch deleted file mode 100644 index d05f9a5b1a15f6..00000000000000 --- a/ports/skia/skia-include-string.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gpu/ganesh/d3d/GrD3DUtil.h b/src/gpu/ganesh/d3d/GrD3DUtil.h -index 7a1078b629..bd5605ae91 100644 ---- a/src/gpu/ganesh/d3d/GrD3DUtil.h -+++ b/src/gpu/ganesh/d3d/GrD3DUtil.h -@@ -8,6 +8,8 @@ - #ifndef GrD3DUtil_DEFINED - #define GrD3DUtil_DEFINED - -+#include -+ - #include "include/core/SkImage.h" - #include "include/gpu/ganesh/GrTypes.h" - #include "include/gpu/ganesh/d3d/GrD3DTypes.h" diff --git a/ports/skia/skparagraph-dllexport.patch b/ports/skia/skparagraph-dllexport.patch index d3ab24aca6adfc..e8048b510b8e23 100644 --- a/ports/skia/skparagraph-dllexport.patch +++ b/ports/skia/skparagraph-dllexport.patch @@ -21,7 +21,7 @@ index dedc68fa4a..d748247c19 100644 "../..:skia", "../skunicode", diff --git a/modules/skparagraph/include/FontCollection.h b/modules/skparagraph/include/FontCollection.h -index a6b36efabe..5c210c5ae5 100644 +index 7611e7e194..9db3407ecd 100644 --- a/modules/skparagraph/include/FontCollection.h +++ b/modules/skparagraph/include/FontCollection.h @@ -8,6 +8,7 @@ @@ -42,7 +42,7 @@ index a6b36efabe..5c210c5ae5 100644 FontCollection(); diff --git a/modules/skparagraph/include/ParagraphBuilder.h b/modules/skparagraph/include/ParagraphBuilder.h -index feac5622bb..8b1576fdfc 100644 +index c8189cc446..5a01557949 100644 --- a/modules/skparagraph/include/ParagraphBuilder.h +++ b/modules/skparagraph/include/ParagraphBuilder.h @@ -7,6 +7,7 @@ diff --git a/ports/skia/skpath-enable-edit-methods.patch b/ports/skia/skpath-enable-edit-methods.patch deleted file mode 100644 index 8b33298dacc8b5..00000000000000 --- a/ports/skia/skpath-enable-edit-methods.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/BUILD.gn b/BUILD.gn -index b45e6e6f05..fba779ffba 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -24,9 +24,6 @@ config("skia_public") { - defines = [ - "SK_CODEC_DECODES_BMP", - "SK_CODEC_DECODES_WBMP", -- -- # TODO(kjlubick,fmalita) Remove when clients updated and APIs deleted. -- "SK_HIDE_PATH_EDIT_METHODS", - ] - cflags_objcc = [] - if (is_component_build) { diff --git a/ports/skia/use-pkgconfig-to-find-gl.patch b/ports/skia/use-pkgconfig-to-find-gl.patch index 0f82b71ddabfad..8b041f129105f6 100644 --- a/ports/skia/use-pkgconfig-to-find-gl.patch +++ b/ports/skia/use-pkgconfig-to-find-gl.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index ce41442..9a90d00 100644 +index 37cfe09694..def43b13f1 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1007,7 +1007,9 @@ optional("gpu") { +@@ -993,7 +993,9 @@ optional("gpu") { "src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp", "src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp", ] diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 5adf082d8b6501..d7533d5dfcbd06 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "skia", - "version": "144", + "version": "145", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/skia/vulkan-headers.patch b/ports/skia/vulkan-headers.patch index 5849bde2400cec..aee0d7a9591bcf 100644 --- a/ports/skia/vulkan-headers.patch +++ b/ports/skia/vulkan-headers.patch @@ -1,10 +1,10 @@ diff --git a/BUILD.gn b/BUILD.gn -index c6966d249d..d795e2b783 100644 +index aaadf42aa1..37cfe09694 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -906,6 +906,7 @@ optional("gpu_shared") { +@@ -908,6 +908,7 @@ optional("gpu_shared") { } - + if (skia_use_vulkan) { + public_deps += [ "//third_party/externals/vulkan-headers:vulkan_headers" ] public_defines += [ "SK_VULKAN" ] @@ -15,9 +15,9 @@ index 1e962ad60a..535ac6b88f 100644 --- a/include/private/gpu/vk/SkiaVulkan.h +++ b/include/private/gpu/vk/SkiaVulkan.h @@ -12,6 +12,10 @@ - + // IWYU pragma: begin_exports - + +#ifdef SK_USE_INTERNAL_VULKAN_HEADERS +# undef SK_USE_INTERNAL_VULKAN_HEADERS +#endif diff --git a/scripts/test_ports/vcpkg-ci-dawn/project/main.cpp b/scripts/test_ports/vcpkg-ci-dawn/project/main.cpp index 74bf086888f6cb..6198645d360e8a 100755 --- a/scripts/test_ports/vcpkg-ci-dawn/project/main.cpp +++ b/scripts/test_ports/vcpkg-ci-dawn/project/main.cpp @@ -36,11 +36,11 @@ wgpu::Instance create_instance() { wgpu::InstanceDescriptor instance_desc; - std::vector required_features = { + wgpu::InstanceFeatureName required_features[] = { wgpu::InstanceFeatureName::TimedWaitAny, }; - instance_desc.requiredFeatureCount = required_features.size(); - instance_desc.requiredFeatures = required_features.data(); + instance_desc.requiredFeatureCount = std::size(required_features); + instance_desc.requiredFeatures = required_features; return wgpu::CreateInstance(&instance_desc); } @@ -59,8 +59,8 @@ wgpu::Adapter request_adapter(const wgpu::Instance &instance, const wgpu::Surfac message.data); adapter = std::move(adapter_ret); }); - ASSERT(instance.WaitAny(adapter_future, wgpu::kLimitU64Undefined) == wgpu::WaitStatus::Success, - "Failed to wait for adapter request"); + auto wait_status = instance.WaitAny(adapter_future, wgpu::kLimitU64Undefined); + ASSERT(wait_status == wgpu::WaitStatus::Success, "Failed to wait for adapter request"); return adapter; } @@ -104,8 +104,8 @@ wgpu::Device request_device(const wgpu::Instance &instance, const wgpu::Adapter message.data); device = std::move(device_ret); }); - ASSERT(instance.WaitAny(device_future, wgpu::kLimitU64Undefined) == wgpu::WaitStatus::Success, - "Failed to wait for device request"); + auto wait_status = instance.WaitAny(device_future, wgpu::kLimitU64Undefined); + ASSERT(wait_status == wgpu::WaitStatus::Success, "Failed to wait for device request"); return device; } @@ -136,13 +136,12 @@ struct AppState { wgpu::Device device; wgpu::Queue queue; wgpu::SurfaceConfiguration surface_config; - int surface_width = 0; - int surface_height = 0; }; int main() { glfwSetErrorCallback(glfw_error_callback); - ASSERT(glfwInit(), "GLFW init failed"); + auto glfw_inited = glfwInit(); + ASSERT(glfw_inited, "GLFW init failed"); glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); auto *window = glfwCreateWindow(1024, 1024, "vcpkg-ci-dawn", nullptr, nullptr); @@ -155,15 +154,16 @@ int main() { wgpu::SurfaceCapabilities surface_capabilities; state.surface.GetCapabilities(state.adapter, &surface_capabilities); - glfwGetFramebufferSize(window, &state.surface_width, &state.surface_height); + int surface_width, surface_height; + glfwGetFramebufferSize(window, &surface_width, &surface_height); state.surface_config.device = state.device; state.surface_config.usage = wgpu::TextureUsage::RenderAttachment; state.surface_config.format = surface_capabilities.formats[0]; state.surface_config.presentMode = surface_capabilities.presentModes[0]; state.surface_config.alphaMode = surface_capabilities.alphaModes[0]; - state.surface_config.width = state.surface_width; - state.surface_config.height = state.surface_height; + state.surface_config.width = surface_width; + state.surface_config.height = surface_height; state.surface.Configure(&state.surface_config); glfwSetWindowUserPointer(window, &state); @@ -175,8 +175,6 @@ int main() { }); glfwSetFramebufferSizeCallback(window, [](GLFWwindow *window, int width, int height) { auto &state = *static_cast(glfwGetWindowUserPointer(window)); - state.surface_width = width; - state.surface_height = height; state.surface_config.width = width; state.surface_config.height = height; state.surface.Configure(&state.surface_config); @@ -380,7 +378,8 @@ fn fs_main(input: FragmentInput) -> FragmentOutput { state.queue.Submit(1, &command_buffer); #if !defined(__EMSCRIPTEN__) - ASSERT(state.surface.Present(), "Failed to present the surface"); + auto present_status = state.surface.Present(); + ASSERT(present_status, "Failed to present the surface"); state.device.Tick(); #endif } diff --git a/versions/baseline.json b/versions/baseline.json index 359f6d7202a2ab..1515a69bcfd90f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2389,8 +2389,8 @@ "port-version": 0 }, "dawn": { - "baseline": "20251202.213730", - "port-version": 2 + "baseline": "20260201.182244", + "port-version": 0 }, "daxa": { "baseline": "3.3.1", @@ -9141,7 +9141,7 @@ "port-version": 0 }, "skia": { - "baseline": "144", + "baseline": "145", "port-version": 0 }, "skyr-url": { diff --git a/versions/d-/dawn.json b/versions/d-/dawn.json index 5cb5036590031c..ef2d92426240ba 100644 --- a/versions/d-/dawn.json +++ b/versions/d-/dawn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fdde1cd2f7097bbd2367f1b8f3ec4a37081aebf", + "version": "20260201.182244", + "port-version": 0 + }, { "git-tree": "f9d0ccec0c29cc0028a3380a85ed8728dc40bf92", "version": "20251202.213730", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 11150cddb3bd6d..2cb679833a3572 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53af23a35f5083c10bc71ef8c82e9735f24224ab", + "version": "145", + "port-version": 0 + }, { "git-tree": "49644bbec29e7c5301d670487212d30505306b93", "version": "144",