From 53a5d62885a2a3e61dd49538a107a323f74c0f3e Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 27 Mar 2020 14:07:14 +0100 Subject: [PATCH 1/3] Update Skia version to 1.68.1 --- .../cross-compile-libSkiaSharp.sh | 2 +- .../compile-libSkiaSharp.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/cross-compile-libSkiaSharp.sh b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/cross-compile-libSkiaSharp.sh index 5288082..c703f56 100644 --- a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/cross-compile-libSkiaSharp.sh +++ b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/cross-compile-libSkiaSharp.sh @@ -4,7 +4,7 @@ TOOLCHAIN_ARM64=gcc-linaro-4.9.4-2017.01-x86_64_aarch64-linux-gnu set -e if [ ! -d "skia" ] ; then - git clone https://github.com/mono/skia.git -b v1.68.0 --depth 1 skia + git clone https://github.com/mono/skia.git -b v1.68.1 --depth 1 skia fi if [ ! -d "depot_tools" ] ; then git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git --depth 1 diff --git a/Jellyfin.SkiaSharp.NativeAssets.LinuxMusl/compile-libSkiaSharp.sh b/Jellyfin.SkiaSharp.NativeAssets.LinuxMusl/compile-libSkiaSharp.sh index bcbbcc4..03fd2fa 100644 --- a/Jellyfin.SkiaSharp.NativeAssets.LinuxMusl/compile-libSkiaSharp.sh +++ b/Jellyfin.SkiaSharp.NativeAssets.LinuxMusl/compile-libSkiaSharp.sh @@ -3,7 +3,7 @@ set -e if [ ! -d "skia" ] ; then - git clone https://github.com/mono/skia.git -b v1.68.0 --depth 1 skia + git clone https://github.com/mono/skia.git -b v1.68.1 --depth 1 skia fi cd skia From f83d69fcdd30a86284ea79f0ef861eededd964d8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 28 Mar 2020 10:18:25 +0100 Subject: [PATCH 2/3] Add .bat file to build with docker on Windows --- Jellyfin.SkiaSharp.NativeAssets.LinuxArm/README.md | 2 +- Jellyfin.SkiaSharp.NativeAssets.LinuxArm/build-in-docker.bat | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Jellyfin.SkiaSharp.NativeAssets.LinuxArm/build-in-docker.bat diff --git a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/README.md b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/README.md index b581373..d889c93 100644 --- a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/README.md +++ b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/README.md @@ -11,5 +11,5 @@ The 64-bit build runs with `-flax-vector-conversions` so, use at your own risk. ## Build (non Debian) (uses docker) -1. `build-in-docker.sh` +1. `build-in-docker.sh` (on Linux) or `build-in-docker.bat` (on Windows) 2. `nuget pack` \ No newline at end of file diff --git a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/build-in-docker.bat b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/build-in-docker.bat new file mode 100644 index 0000000..d024a3d --- /dev/null +++ b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/build-in-docker.bat @@ -0,0 +1,5 @@ +docker build -t libskiasharp-linuxarm . +mkdir runtimes/linux-arm/native +mkdir runtimes/linux-arm64/native +docker run --rm -v "%CD%/runtimes/linux-arm/native:/temp" "libskiasharp-linuxarm" cp /build/skia/out/linux-arm/libSkiaSharp.so /temp/ +docker run --rm -v "%CD%/runtimes/linux-arm64/native:/temp64" "libskiasharp-linuxarm" cp /build/skia/out/linux-arm64/libSkiaSharp.so /temp64/ \ No newline at end of file From 3ab625eac157e01d2116ef100478e95c646dda96 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 28 Mar 2020 10:18:38 +0100 Subject: [PATCH 3/3] Update .nuspec --- .../Jellyfin.SkiaSharp.NativeAssets.LinuxArm.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/Jellyfin.SkiaSharp.NativeAssets.LinuxArm.nuspec b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/Jellyfin.SkiaSharp.NativeAssets.LinuxArm.nuspec index 7868c09..b6027c0 100644 --- a/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/Jellyfin.SkiaSharp.NativeAssets.LinuxArm.nuspec +++ b/Jellyfin.SkiaSharp.NativeAssets.LinuxArm/Jellyfin.SkiaSharp.NativeAssets.LinuxArm.nuspec @@ -5,7 +5,7 @@ Jellyfin.SkiaSharp.NativeAssets.LinuxArm Jellyfin.SkiaSharp.NativeAssets.LinuxArm - 1.68.0 + 1.68.1 This is a Raspbian tools built ARM32+ARM64 native library for SkiaSharp. @@ -29,7 +29,7 @@ © Microsoft Corporation. All rights reserved. - +