Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ports/dawn/001-fix-windows-build.patch
Original file line number Diff line number Diff line change
@@ -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 $<TARGET_PDB_FILE:${name}> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
- endif()
+ #if ((target_type STREQUAL "SHARED_LIBRARY") OR (target_type STREQUAL "EXECUTABLE"))
+ # install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+ #endif()
endif (MSVC)

# Automatically determine where each header should go based on its subdirectory in the include dir.
6 changes: 3 additions & 3 deletions ports/dawn/003-fix-d3d11.patch
Original file line number Diff line number Diff line change
@@ -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()

Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ports/dawn/004-deps.patch
Original file line number Diff line number Diff line change
@@ -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
################################################################################
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ports/dawn/005-bsd-support.patch
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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 @@
Expand All @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions ports/dawn/008-wrong-dxcapi-include.patch
Original file line number Diff line number Diff line change
@@ -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 <dxcapi.h>
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
14 changes: 12 additions & 2 deletions ports/dawn/009-fix-tint-install.patch
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
4 changes: 2 additions & 2 deletions ports/dawn/010-fix-glslang.patch
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
10 changes: 5 additions & 5 deletions ports/dawn/011-fix-dxc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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")
- add_dependencies(dawn_native copy_dxil_dll)
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)
Expand All @@ -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)
Expand Down
43 changes: 20 additions & 23 deletions ports/dawn/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions ports/dawn/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ports/skia/allow-disabling-lib-dl.patch
Original file line number Diff line number Diff line change
@@ -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" ]
}
Expand All @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ports/skia/always-build-pathops.patch
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ports/skia/dawn.patch
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion ports/skia/dont-use-response-file.patch
Original file line number Diff line number Diff line change
@@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion ports/skia/graphite.patch
Original file line number Diff line number Diff line change
@@ -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 @@
Expand Down
4 changes: 2 additions & 2 deletions ports/skia/pdfsubsetfont-uwp.diff
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ index 307c4304a2..db723bcd42 100644
--- a/src/pdf/SkPDFSubsetFont.cpp
+++ b/src/pdf/SkPDFSubsetFont.cpp
@@ -111,6 +111,7 @@ sk_sp<SkData> SkPDFSubsetFont(const SkTypeface& typeface, const SkPDFGlyphUse& g

#else

+#include "include/core/SkData.h"
sk_sp<SkData> SkPDFSubsetFont(const SkTypeface&, const SkPDFGlyphUse&) {
return nullptr;
Expand Down
Loading
Loading