From 033922bf1e0d07e84464c7aea6314427b56e4eb8 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Tue, 22 Feb 2022 14:40:54 +0700 Subject: [PATCH 1/6] build on apple M1 --- ports/skia/portfile.cmake | 4 ++++ ports/skia/vcpkg.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 72f5ed140a2d1a..dc6881eecf5350 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -108,6 +108,10 @@ skia_use_lua=false \ skia_enable_tools=false \ skia_enable_spirv_validation=false") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPTIONS "${OPTIONS} target_cpu=\"arm64\"") +endif() + # used for passing feature-specific definitions to the config file set(SKIA_PUBLIC_DEFINITIONS "") diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 391163edd6e854..145c3d09581c63 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -8,7 +8,7 @@ "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." ], "homepage": "https://skia.org", - "supports": "x64 & (osx | windows)", + "supports": "(osx | windows)", "dependencies": [ "expat", { From a4373b891673e4174102220e3b0ec48ce893c2fb Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Tue, 22 Feb 2022 14:51:13 +0700 Subject: [PATCH 2/6] fixed port version and date --- ports/skia/vcpkg.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 145c3d09581c63..951d2cb8bc586f 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,14 +1,14 @@ { "name": "skia", - "version-date": "2020-05-18", - "port-version": 7, + "version-date": "2022-02-22", + "port-version": 8, "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.", "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." ], "homepage": "https://skia.org", - "supports": "(osx | windows)", + "supports": "osx | windows", "dependencies": [ "expat", { From 2a55ab7f471d13a22be7c32902e4818231152294 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Tue, 22 Feb 2022 14:53:05 +0700 Subject: [PATCH 3/6] more changes --- versions/baseline.json | 4 ++-- versions/s-/skia.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6b3147e52ca18c..da944d9009049f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6425,8 +6425,8 @@ "port-version": 0 }, "skia": { - "baseline": "2020-05-18", - "port-version": 7 + "baseline": "2022-02-22", + "port-version": 8 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 4c664f1d222e00..e8278dc03d5d6f 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20fe6c55f0695481090ccc728084090923974dab", + "version-date": "2022-02-22", + "port-version": 8 + }, { "git-tree": "f7b3961a52ea4c43d781a5c8ace67d0ef100cce7", "version-date": "2020-05-18", From cbb4e4dda936d692f3f657d01f44d70d0ad9f6ba Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Tue, 22 Feb 2022 15:25:00 +0700 Subject: [PATCH 4/6] Update version database --- versions/s-/skia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/skia.json b/versions/s-/skia.json index e8278dc03d5d6f..26604222eafb1c 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "20fe6c55f0695481090ccc728084090923974dab", + "git-tree": "4c89c525c081c6766eff73874ad6bbcd2a781557", "version-date": "2022-02-22", "port-version": 8 }, From e0e122d58bc7fd62e53c8c13b0bf5d97ac25173d Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Wed, 23 Feb 2022 15:20:12 +0700 Subject: [PATCH 5/6] reverted date --- ports/skia/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/skia.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 951d2cb8bc586f..d8991a23706f55 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "skia", - "version-date": "2022-02-22", + "version-date": "2020-05-18", "port-version": 8, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", diff --git a/versions/baseline.json b/versions/baseline.json index da944d9009049f..df67e110a34e1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6425,7 +6425,7 @@ "port-version": 0 }, "skia": { - "baseline": "2022-02-22", + "baseline": "2020-05-18", "port-version": 8 }, "skyr-url": { diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 26604222eafb1c..9f898e8f798b93 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "4c89c525c081c6766eff73874ad6bbcd2a781557", - "version-date": "2022-02-22", + "version-date": "2020-05-18", "port-version": 8 }, { From 7ad8b91150af3fc5131275527f405de7e442aaf1 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Wed, 23 Feb 2022 16:10:25 +0700 Subject: [PATCH 6/6] updated versions --- versions/s-/skia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 9f898e8f798b93..168d625e74968f 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4c89c525c081c6766eff73874ad6bbcd2a781557", + "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", "version-date": "2020-05-18", "port-version": 8 },