diff options
| author | ZeeWanderer <mxx888777@gmail.com> | 2020-05-08 08:30:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 22:30:20 -0700 |
| commit | 124e8151c1b1b19342fd819b94a455c892c5d1b7 (patch) | |
| tree | 41fc655da72eb41781b2d000d80d272b6dd4f6f8 | |
| parent | f2314218cdcfe2f3697b0314cd53dbd214963a8c (diff) | |
| download | vcpkg-124e8151c1b1b19342fd819b94a455c892c5d1b7.tar.gz vcpkg-124e8151c1b1b19342fd819b94a455c892c5d1b7.zip | |
[blend2d] Update to beta_2020-05-04 (#11155)
| -rw-r--r-- | ports/blend2d/CONTROL | 8 | ||||
| -rw-r--r-- | ports/blend2d/portfile.cmake | 23 |
2 files changed, 17 insertions, 14 deletions
diff --git a/ports/blend2d/CONTROL b/ports/blend2d/CONTROL index b032f9ba0..7f4ddc86d 100644 --- a/ports/blend2d/CONTROL +++ b/ports/blend2d/CONTROL @@ -1,7 +1,8 @@ Source: blend2d -Version: beta_2020-04-19 +Version: beta_2020-05-04 +Homepage: https://github.com/blend2d/blend2d Description: Beta 2D Vector Graphics Powered by a JIT Compiler -Default-Features: jit, logging +Default-Features: jit, logging, tls Supports: !(arm|uwp) Feature: jit @@ -9,3 +10,6 @@ Description: Default feature. Enables jit pipeline compilation. Not supported fo Feature: logging Description: Default feature. Enables logging. + +Feature: tls +Description: Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported. diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 2f6480655..90dc2211f 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -3,26 +3,26 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF b9eb3657be24a1ed5aded86ee065352c1703c9e0 - SHA512 e5c0b447b3ae773d759149e9c43038fd05e8444a5b8013d81b444e825662eaa55c10105c3cd849495e243e62e1b2e53386055daacb36a271f594c462778ea255 + REF 841360f653d8f2a749e40d4e31807dfac3d6df29 + SHA512 4ea11a2b74aa824a92cdb221ef6d019218379639b0cb005294e95f51f88955e7ec4aba2c837ea756b118ae10280679b9ec6c9345e3b25ba08d7b6f935a85cf2b HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC) -if(NOT ("jit" IN_LIST FEATURES)) - set(BLEND2D_BUILD_NO_JIT TRUE) -endif() -if(NOT ("logging" IN_LIST FEATURES)) - set(BLEND2D_BUILD_NO_LOGGING TRUE) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + jit BLEND2D_NO_JIT + logging BLEND2D_NO_JIT_LOGGING + tls BLEND2D_NO_TLS +) if(NOT BLEND2D_BUILD_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF d241dfb364ba8984f621331e889014507ecb5bfc - SHA512 345d9645f204b23e1fbedc4ab6a73790e07f8f91a953f8a89e053c3431a80c0a7430c7e2b2130d11d0029ee851f3bf1b046d7e1c9ba12396ffb9c9ee05403fc7 + REF 80645e66a8ae85749937bda3b329388c8a76ea4c + SHA512 8e7b0aed14e8ce05e6e6b2eed77be23a81b9548a146aef187ac6beced3bc2a6cba92835718adb901a1ab983fab32f3e9f18061b157b2276bb1451a71ca1195b8 HEAD_REF master ) @@ -38,8 +38,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBLEND2D_STATIC=${BLEND2D_STATIC} - -DBLEND2D_BUILD_NO_JIT=${BLEND2D_BUILD_NO_JIT} - -DBLEND2D_BUILD_NO_LOGGING=${BLEND2D_BUILD_NO_LOGGING} + ${FEATURE_OPTIONS} ) |