diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL index e374a5888f72a3..708ea67e1334d0 100644 --- a/ports/liblsl/CONTROL +++ b/ports/liblsl/CONTROL @@ -1,3 +1,6 @@ Source: liblsl -Version: 1.13.1 +Version: 1.14.0 +Homepage: https://github.com/sccn/liblsl Description: C++ lsl library for multi-modal time-synched data transmission over the local network +Supports: !(static & staticcrt) +Build-Depends: pugixml diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index 38a74bf239bb2d..a8d56b0bdb664f 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -1,35 +1,32 @@ -set(VCPKG_LIBRARY_LINKAGE dynamic) +# static builds are currently not supported since liblsl always also builds shared binaries +# which need to be deleted for vcpkg but then the CMake target can no longer be imported because it still references them +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl - REF 1.13.1 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake - SHA512 95cfd69cff86eb7de62624775f3037dd71a5240a6ad82c12d9340bfaf2c38c25ac9e884b01635bf71e27fcd9ce385602d8fa347c61b6ce10cf2bb7f0ad761282 + REF v1.14.0 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake + SHA512 b4ec379339d174c457c8c1ec69f9e51ea78a738e72ecc96b9193f07b5273acb296b5b1f90c9dfe16591ecab0eef9aae9add640c1936d3769cae0bd96617205ec HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DLSL_BUILD_STATIC=OFF - -DLSL_UNIXFOLDERS=ON - -DLSL_NO_FANCY_LIBNAME=ON - -Dlslgitrevision="1.13.1" - -Dlslgitbranch="master" + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLSL_BUILD_STATIC=OFF + -DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead + -Dlslgitrevision=v1.14.0 + -Dlslgitbranch=master ) vcpkg_install_cmake() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN) -if(VCPKG_TARGET_IS_WINDOWS) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/lslver.exe) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/lslver/) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/lslver.exe ${CURRENT_PACKAGES_DIR}/tools/lslver/lslver.exe) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 257db0c3d7a2dd..89e91d7c876de3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -619,8 +619,6 @@ liblo:x64-osx=fail liblo:x64-uwp=fail liblsl:arm64-windows=fail liblsl:arm-uwp=fail -liblsl:x64-linux=fail -liblsl:x64-osx=fail liblsl:x64-uwp=fail libmad:arm-uwp=fail libmad:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 812beabe2298f8..b2baca5cf2a377 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3145,7 +3145,7 @@ "port-version": 0 }, "liblsl": { - "baseline": "1.13.1", + "baseline": "1.14.0", "port-version": 0 }, "liblzma": { diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json index 7f82764116fda7..66cfc9907203ef 100644 --- a/versions/l-/liblsl.json +++ b/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5be8e82edc3261bef4114e428191a4ccc9271892", + "version-string": "1.14.0", + "port-version": 0 + }, { "git-tree": "1b86d81c846a0b8f0ad92ce19598e58b56096d08", "version-string": "1.13.1",