diff --git a/archivers/vbz-compression/Makefile b/archivers/vbz-compression/Makefile index 0926d0a7d963..b8366b65f26a 100644 --- a/archivers/vbz-compression/Makefile +++ b/archivers/vbz-compression/Makefile @@ -1,32 +1,31 @@ PORTNAME= vbz-compression -DISTVERSIONPREFIX= v -DISTVERSION= 1.0.3 +DISTVERSION= 1.0.12 CATEGORIES= archivers MAINTAINER= jwb@FreeBSD.org COMMENT= Variable byte integer encoding to compress Oxford Nanopore signal data WWW= https://github.com/nanoporetech/vbz_compression LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENCE.txt BUILD_DEPENDS= streamvbyte>=0.4.1:archivers/streamvbyte LIB_DEPENDS= libhdf5.so:science/hdf5 \ libzstd.so:archivers/zstd USES= cmake USE_GITHUB= yes USE_LDCONFIG= ${PREFIX}/hdf5/lib/plugin GH_ACCOUNT= nanoporetech GH_PROJECT= vbz_compression CMAKE_ARGS= -DENABLE_CONAN=OFF \ -DENABLE_PERF_TESTING=OFF \ -DENABLE_PYTHON=OFF \ -DSTREAMVBYTE_INSTALL_DIR=${LOCALBASE} \ -DSTREAMVBYTE_STATIC_LIB=${LOCALBASE}/lib/libstreamvbyte.a PLIST_FILES= hdf5/lib/plugin/libvbz_hdf_plugin.so .include diff --git a/archivers/vbz-compression/distinfo b/archivers/vbz-compression/distinfo index e035668999a8..f546e9cc3ccb 100644 --- a/archivers/vbz-compression/distinfo +++ b/archivers/vbz-compression/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661638684 -SHA256 (nanoporetech-vbz_compression-v1.0.3_GH0.tar.gz) = a7450e076db628681bbc0e2b3f941c6c21cc2981a7e1c78628807ffdf1b34f31 -SIZE (nanoporetech-vbz_compression-v1.0.3_GH0.tar.gz) = 5339759 +TIMESTAMP = 1736858584 +SHA256 (nanoporetech-vbz_compression-1.0.12_GH0.tar.gz) = 9074bafe35d0b73114fbbfdc50a5d4e34cda38507390484ee1da9b0a609c4678 +SIZE (nanoporetech-vbz_compression-1.0.12_GH0.tar.gz) = 5361349 diff --git a/archivers/vbz-compression/files/patch-CMakeLists.txt b/archivers/vbz-compression/files/patch-CMakeLists.txt index 048c9e78875d..c1d4296057ec 100644 --- a/archivers/vbz-compression/files/patch-CMakeLists.txt +++ b/archivers/vbz-compression/files/patch-CMakeLists.txt @@ -1,37 +1,42 @@ ---- CMakeLists.txt.orig 2020-06-19 15:45:38 UTC +--- CMakeLists.txt.orig 2025-01-14 12:40:34 UTC +++ CMakeLists.txt -@@ -139,34 +139,6 @@ find_package(HDF5 1.8.16) +@@ -151,39 +151,6 @@ find_package(Sanitizers) find_package(zstd 1.3.1 REQUIRED) find_package(Sanitizers) -get_filename_component(STREAMVBYTE_SOURCE_DIR - third_party/streamvbyte - ABSOLUTE -) -set(STREAMVBYTE_INSTALL_DIR "${CMAKE_BINARY_DIR}/streamvbyte_lib/") -set(STREAMVBYTE_PREFIX ${CMAKE_BINARY_DIR}/streamvbyte) --set(STREAMVBYTE_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}streamvbyte_static${CMAKE_STATIC_LIBRARY_SUFFIX}) +-set(STREAMVBYTE_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}streamvbyte${CMAKE_STATIC_LIBRARY_SUFFIX}) -set(STREAMVBYTE_STATIC_LIB_SUBDIR ".") -get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if (is_multi_config) - set(STREAMVBYTE_STATIC_LIB_SUBDIR "$") -endif() -ExternalProject_Add( - streamvbyte - SOURCE_DIR ${STREAMVBYTE_SOURCE_DIR} - UPDATE_DISCONNECTED TRUE - PREFIX ${STREAMVBYTE_PREFIX} -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STREAMVBYTE_INSTALL_DIR} -DSTREAMVBYTE_DISABLE_NATIVE=ON -DSTD_FLAGS="-std=c99" +- CMAKE_ARGS +- -D CMAKE_INSTALL_PREFIX=${STREAMVBYTE_INSTALL_DIR} +- -D CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} +- -D CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} +- -D STREAMVBYTE_SANITIZE=${SANITIZE_ADDRESS} +- -D STREAMVBYTE_SANITIZE_UNDEFINED=${SANITIZE_UNDEFINED} - # We need to tell CMake about libraries we will link to, otherwise some generators (eg: Ninja) - # complain about how knowing how to build libstreamvbyte_static.a, for example. - # Ideally, we'd set a hypothetical INSTALL_BYPRODUCTS, and link to the installed file, but that - # doesn't seem to be an option. -- BUILD_BYPRODUCTS "/${STREAMVBYTE_STATIC_LIB_NAME}" +- BUILD_BYPRODUCTS "/${STREAMVBYTE_STATIC_LIB_SUBDIR}/${STREAMVBYTE_STATIC_LIB_NAME}" -) -ExternalProject_Get_Property(streamvbyte BINARY_DIR) -set(STREAMVBYTE_STATIC_LIB "${BINARY_DIR}/${STREAMVBYTE_STATIC_LIB_SUBDIR}/${STREAMVBYTE_STATIC_LIB_NAME}") - - ######################################################################## # # Warnings diff --git a/archivers/vbz-compression/files/patch-vbz_CMakeLists.txt b/archivers/vbz-compression/files/patch-vbz_CMakeLists.txt index f52461b2119c..3af5ffc7773f 100644 --- a/archivers/vbz-compression/files/patch-vbz_CMakeLists.txt +++ b/archivers/vbz-compression/files/patch-vbz_CMakeLists.txt @@ -1,15 +1,15 @@ ---- vbz/CMakeLists.txt.orig 2022-04-29 12:18:23 UTC +--- vbz/CMakeLists.txt.orig 2025-01-14 12:42:19 UTC +++ vbz/CMakeLists.txt -@@ -25,12 +25,6 @@ target_include_directories(vbz +@@ -24,12 +24,6 @@ target_include_directories(vbz ${STREAMVBYTE_INSTALL_DIR}/include ) -# This explicit dependency is required to make sure the header files are installed into the right -# location before we try building against them. -add_dependencies(vbz - streamvbyte -) - - if (WIN32 OR - (APPLE AND NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64") OR - "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") + option(VBZ_DISABLE_SSE3 "Disable SSE3 optimisations" OFF) + if ((WIN32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") AND NOT VBZ_DISABLE_SSE3) + message(STATUS "SSE3 optimisations enabled")