From 67231f336edb010193addcbad4276a5dfdd8e34d Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Tue, 7 Nov 2023 10:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmac=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9E=84=E5=BB=BAengine=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- attachment/repos/skia.patch | 20 ++++++++++++++++++++ tools/gn | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/attachment/repos/skia.patch b/attachment/repos/skia.patch index c568668d3c..1e6e940827 100644 --- a/attachment/repos/skia.patch +++ b/attachment/repos/skia.patch @@ -932,6 +932,26 @@ index 0000000000..eb318dc3a3 +#endif + +#endif /* __gl2platform_h_ */ +diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.mm b/src/gpu/ganesh/mtl/GrMtlGpu.mm +index 7979a2ede9..08440478db 100644 +--- a/src/gpu/ganesh/mtl/GrMtlGpu.mm ++++ b/src/gpu/ganesh/mtl/GrMtlGpu.mm +@@ -1584,13 +1584,13 @@ void copy_src_data(char* dst, + dispatch_semaphore_signal(semaphore); + }); + +- const void* cfFence = (__bridge_retained const void*) semaphore; ++ const void* cfFence = (const void*) semaphore; + return (GrFence) cfFence; + } + + bool GrMtlGpu::waitFence(GrFence fence) { + const void* cfFence = (const void*) fence; +- dispatch_semaphore_t semaphore = (__bridge dispatch_semaphore_t)cfFence; ++ dispatch_semaphore_t semaphore = (dispatch_semaphore_t)cfFence; + + long result = dispatch_semaphore_wait(semaphore, 0); + diff --git a/src/ports/skia_ohos/FontConfig_ohos.cpp b/src/ports/skia_ohos/FontConfig_ohos.cpp new file mode 100644 index 0000000000..10c967ee02 diff --git a/tools/gn b/tools/gn index 99b7b88e79..a5efe0f75d 100755 --- a/tools/gn +++ b/tools/gn @@ -160,7 +160,7 @@ def get_host_os(): # Rosetta. I.e., python3 is an x64 executable and we're on an arm64 Mac. def is_rosetta(): if platform.system() == 'Darwin': - proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'], + proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) output, _ = proc.communicate() -- Gitee