diff --git a/externals/skia b/externals/skia index 6d51638657..aecc25f755 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 6d51638657bdc907cc78458ad5164ed2da95b333 +Subproject commit aecc25f7552b4e840cd7618e947f8738ddd4f121 diff --git a/native/android/build.cake b/native/android/build.cake index 10ad278bef..74e911d83b 100644 --- a/native/android/build.cake +++ b/native/android/build.cake @@ -24,7 +24,7 @@ Task("libSkiaSharp") $"target_os='android' target_cpu='{skiaArch}' " + $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + - $"extra_cflags=[ '-DSKIA_C_DLL' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM' ] " + $"ndk='{ANDROID_NDK_HOME}' " + $"ndk_api={(skiaArch == "x64" || skiaArch == "arm64" ? 21 : 16)}"); diff --git a/native/ios/build.cake b/native/ios/build.cake index 35c1b96a2f..b8e69eddd6 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -32,7 +32,7 @@ Task("libSkiaSharp") $"target_os='ios' target_cpu='{skiaArch}' " + $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-mios-version-min=8.0' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mios-version-min=8.0' ] " + $"extra_ldflags=[ '-Wl,ios_version_min=8.0' ]"); RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch); diff --git a/native/linux/build.cake b/native/linux/build.cake index 68f75f02cc..7a73822864 100644 --- a/native/linux/build.cake +++ b/native/linux/build.cake @@ -40,7 +40,7 @@ Task("libSkiaSharp") $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + $"skia_enable_gpu={(SUPPORT_GPU ? "true" : "false")} " + - $"extra_cflags=[ '-DSKIA_C_DLL' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM' ] " + $"extra_ldflags=[ '-static-libstdc++', '-static-libgcc', '-Wl,--version-script={map}' ] " + compilers + $"linux_soname_version='{soname}' " + diff --git a/native/macos/build.cake b/native/macos/build.cake index f94a6e0fcb..e82c47cc0c 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -24,7 +24,7 @@ Task("libSkiaSharp") $"target_os='mac' target_cpu='{skiaArch}' " + $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-mmacosx-version-min=10.7', '-stdlib=libc++' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mmacosx-version-min=10.7', '-stdlib=libc++' ] " + $"extra_ldflags=[ '-Wl,macosx_version_min=10.7', '-stdlib=libc++' ]"); RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", "macosx", arch); diff --git a/native/tizen/build.cake b/native/tizen/build.cake index cdb6095dcb..735553f000 100644 --- a/native/tizen/build.cake +++ b/native/tizen/build.cake @@ -32,7 +32,7 @@ Task("libSkiaSharp") $"skia_use_system_libpng=false " + $"skia_use_system_libwebp=false " + $"skia_use_system_zlib=true " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-DSK_BUILD_FOR_TIZEN' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DSK_BUILD_FOR_TIZEN', '-DXML_DEV_URANDOM' ] " + $"ncli='{TIZEN_STUDIO_HOME}' " + $"ncli_version='4.0'"); diff --git a/native/tvos/build.cake b/native/tvos/build.cake index e21829c2ed..28ec0eec26 100644 --- a/native/tvos/build.cake +++ b/native/tvos/build.cake @@ -28,7 +28,7 @@ Task("libSkiaSharp") $"target_os='tvos' target_cpu='{skiaArch}' " + $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + - $"extra_cflags=[ '-DSK_BUILD_FOR_TVOS', '-DSKIA_C_DLL', '-mtvos-version-min=9.0' ] " + + $"extra_cflags=[ '-DSK_BUILD_FOR_TVOS', '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mtvos-version-min=9.0' ] " + $"extra_ldflags=[ '-Wl,tvos_version_min=9.0' ]"); RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch); diff --git a/native/watchos/build.cake b/native/watchos/build.cake index 1e9f6a5c33..28a387fb94 100644 --- a/native/watchos/build.cake +++ b/native/watchos/build.cake @@ -31,7 +31,7 @@ Task("libSkiaSharp") $"skia_enable_gpu=false " + $"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " + $"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " + - $"extra_cflags=[ '-DSK_BUILD_FOR_WATCHOS', '-DSKIA_C_DLL', '-mwatchos-version-min=2.0' ] " + + $"extra_cflags=[ '-DSK_BUILD_FOR_WATCHOS', '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mwatchos-version-min=2.0' ] " + $"extra_ldflags=[ '-Wl,watchos_version_min=2.0' ]"); RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch);