Skip to content

Commit

Permalink
[blend2d] Port update (#7239)
Browse files Browse the repository at this point in the history
- blend2d updated to `beta_2019-07-16`
 - asmjit updated to `2019-07-16`
 - `BLEND2D_BUILD_STATIC` replaced by `BLEND2D_STATIC`
 - Added usage install in case of `static` linkage
  • Loading branch information
ZeeWanderer authored and Rastaban committed Jul 18, 2019
1 parent 68e909e commit 96925e3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
6 changes: 3 additions & 3 deletions ports/blend2d/CONTROL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Source: blend2d
Version: beta_2019-04-30
Version: beta_2019-07-16
Description: Beta 2D Vector Graphics Powered by a JIT Compiler
Default-Features: jit, logging

Feature: jit
Description: asmjit is used to jit compile pipelines
Description: Default feature. Enables jit pipeline compilation. Not supported for ARM and UWP.

Feature: logging
Description: enables logging
Description: Default feature. Enables logging.
24 changes: 14 additions & 10 deletions ports/blend2d/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO blend2d/blend2d
REF 69141350b5a654f328c8529ae301aa1e6bad5342
SHA512 d9bdd234f443c0ef8793dba1a76cc567bab3f9cf32d835d9e285f7ad946a56e0bc03eab30f61bbce51318e18a74ecfcfc965ac94e1ff6cef21e9b3ccc6a42120
REF 934d07161971aeef5c4ac3b15e69ff57929445ac
SHA512 71b17611c20a8a7d27a37b0984918ce4ed608d8d2d053d116cd4c0ca9b7fcad742f39ef9939d9addf600113c2ad399d1dc4ee72b5f036ccda58b7d4237316928
HEAD_REF master
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC)

if(NOT ("jit" IN_LIST FEATURES))
set(BLEND2D_BUILD_NO_JIT TRUE)
Expand All @@ -17,14 +17,13 @@ if(NOT ("logging" IN_LIST FEATURES))
set(BLEND2D_BUILD_NO_LOGGING TRUE)
endif()


if(NOT BLEND2D_BUILD_NO_JIT)
vcpkg_from_github(
OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
REPO asmjit/asmjit
REF f4e685cef003c40ad0d348d0c9eb2a1fe63d8521
SHA512 77981fc32e746fc88f5707b4a8e8557283261b2657248f0d4900f47bd500de4efe47619a53f32413ea3c6f116e084cac6fdb48b6b92d75e824585d94c785d2b1
HEAD_REF next-wip
REF 5d40561d14f93dc45613bfa03155d1dfb4f5825a
SHA512 88f16fc1ff8e9eb1b8d7441d7bd2e08d238a2104f3de94aaa16972faac704bf526996fa1556a3831701fb370f051df6839b4058690cf2f49ea5aeb1224c84fe0
HEAD_REF master
)

file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/asmjit)
Expand All @@ -38,7 +37,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBLEND2D_BUILD_STATIC=${BLEND2D_BUILD_STATIC}
-DBLEND2D_STATIC=${BLEND2D_STATIC}
-DBLEND2D_BUILD_NO_JIT=${BLEND2D_BUILD_NO_JIT}
-DBLEND2D_BUILD_NO_LOGGING=${BLEND2D_BUILD_NO_LOGGING}
)
Expand All @@ -50,11 +49,16 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)


if(BLEND2D_BUILD_STATIC)
if(BLEND2D_STATIC)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()



# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/blend2d RENAME copyright)
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

if(BLEND2D_STATIC)
# Install usage
configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
endif()
1 change: 1 addition & 0 deletions ports/blend2d/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Define BL_STATIC before any @PORT@ includes.

0 comments on commit 96925e3

Please sign in to comment.