From 6913327612477781ca865002371e794ed4478369 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 18 Apr 2023 06:44:48 +0800 Subject: [PATCH] [blend2d, asmjit] Fix blend2d features build and update asmjit to latest commit (#30820) * [blend2d, asmjit] Fix blend2d features build and update asmjit to latest commit * format vcpkg.json * update version * update blend2d[jit] * update version * fix feature blend2d[logging] * update version --- ports/asmjit/portfile.cmake | 4 ++-- ports/asmjit/vcpkg.json | 2 +- ports/blend2d/portfile.cmake | 6 +++--- ports/blend2d/vcpkg.json | 37 ++++++++++++++++++++++++++++++++---- versions/a-/asmjit.json | 5 +++++ versions/b-/blend2d.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 51 insertions(+), 12 deletions(-) diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 61b66161626..007c0635d9d 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF ae63ced6dd3bc281a959edd32704b27778622be0 # accessed on 2022-11-06 - SHA512 cc074a17524c610183bcf3af49f387fb46a9f32b625351e8727554ed14d92def0fc12bf751f18e2eb5f623c1619e70f32bad6b3d2126485fdd4d0227ecefd6e4 + REF 51b10b19b6631434d3f9ad536a6fb140944a36d2 # commited on 2023-03-25 + SHA512 1fba5159d2adad64e9a2b07a1f90de6988d1da47b9802ca8b57c61a89d8a90924525f6d0d6607279994bdbadcf693b2cc96cd7e4bf7f018ad64127b640dc38fb HEAD_REF master ) diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json index 0bf24897f4a..fedfb2c7f70 100644 --- a/ports/asmjit/vcpkg.json +++ b/ports/asmjit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asmjit", - "version-date": "2022-11-06", + "version-date": "2023-03-25", "description": "Complete x86/x64 JIT and Remote Assembler for C++", "homepage": "https://github.com/asmjit/asmjit", "supports": "!arm", diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 541ef72ffbe..37440a5fea5 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -20,8 +20,8 @@ if(NOT BLEND2D_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF a9ac13536e08041296010645551b2cdcd615d512 - SHA512 64e7649208889f0c96890d3904c2f8e716a72b1edf2dfd07af0114565e03681e503c062af8b4fea4ed70122bd7eab2f966038f7b29058f60f6f3f609508422b6 + REF 51b10b19b6631434d3f9ad536a6fb140944a36d2 # commited on 2023-03-25 + SHA512 1fba5159d2adad64e9a2b07a1f90de6988d1da47b9802ca8b57c61a89d8a90924525f6d0d6607279994bdbadcf693b2cc96cd7e4bf7f018ad64127b640dc38fb HEAD_REF master ) @@ -49,7 +49,7 @@ if(BLEND2D_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") if(BLEND2D_STATIC) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_static.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 602067bb5b9..ebc206c995a 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blend2d", "version-date": "2022-12-31", - "port-version": 2, + "port-version": 3, "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", @@ -28,13 +28,42 @@ "description": "Default feature. Enables use of futex." }, "jit": { - "description": "Default feature. Enables jit pipeline compilation." + "description": "Default feature. Enables jit pipeline compilation.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "futex" + ], + "platform": "windows" + } + ] }, "logging": { - "description": "Default feature. Enables logging." + "description": "Default feature. Enables logging.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "jit" + ] + } + ] }, "tls": { - "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported." + "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "futex" + ], + "platform": "windows" + } + ] } } } diff --git a/versions/a-/asmjit.json b/versions/a-/asmjit.json index de7ffc53f86..82ef33035cc 100644 --- a/versions/a-/asmjit.json +++ b/versions/a-/asmjit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e226149f3b22da2162e7d93eacc9f19411401e62", + "version-date": "2023-03-25", + "port-version": 0 + }, { "git-tree": "adc2ad6be145c9cbf66d606bddc56267b02e41bf", "version-date": "2022-11-06", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 0962ef77e7b..702fb890a1e 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b29172f6f8dd5479a5123214f403137b0180b61f", + "version-date": "2022-12-31", + "port-version": 3 + }, { "git-tree": "89ccc58cff0cc74468ab31076901e5e74b68c6ba", "version-date": "2022-12-31", diff --git a/versions/baseline.json b/versions/baseline.json index f2e201d4a04..79e0af45b4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -241,7 +241,7 @@ "port-version": 6 }, "asmjit": { - "baseline": "2022-11-06", + "baseline": "2023-03-25", "port-version": 0 }, "asmtk": { @@ -594,7 +594,7 @@ }, "blend2d": { "baseline": "2022-12-31", - "port-version": 2 + "port-version": 3 }, "blitz": { "baseline": "2020-03-25",