diff --git a/archivers/openzl/Makefile b/archivers/openzl/Makefile index 61ba6e3e4c9d..94c5f4b4cf25 100644 --- a/archivers/openzl/Makefile +++ b/archivers/openzl/Makefile @@ -1,62 +1,56 @@ PORTNAME= openzl DISTVERSIONPREFIX= v -DISTVERSION= 0.1.0 +DISTVERSION= 0.2.0 CATEGORIES= archivers -MASTER_SITES= https://github.com/google/googletest/releases/download/v${GOOGLETEST_VER}/:googletest -DISTFILES= ${DISTFILE_GOOGLETEST}:googletest -EXTRACT_ONLY= ${DISTFILE_DEFAULT} \ - ${DISTFILE_zstd} MAINTAINER= tagattie@FreeBSD.org COMMENT= Novel data compression framework WWW= https://openzl.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv7 i386 powerpc NOT_FOR_ARCHS_REASON= 32-bit platforms not yet supported (https://github.com/facebook/openzl/issues/342) BUILD_DEPENDS= gmd5sum:sysutils/coreutils -LIB_DEPENDS= libzstd.so:archivers/zstd +LIB_DEPENDS= liblz4.so:archivers/liblz4 \ + libzstd.so:archivers/zstd USES= cmake:indirect gmake USE_GITHUB= yes GH_ACCOUNT= facebook -GH_TUPLE= facebook:zstd:v${ZSTD_VER}:zstd/deps/zstd +GH_TUPLE= facebook:zstd:f8745da6ff1ad1e7bab384bd1f9d742439278e99:zstd/deps/zstd \ + lz4:lz4:ebb370ca83af193212df4dcbadcc5d87bc0de2f0:lz4/deps/lz4 \ + dmlc:xgboost:ccb511768e13d1670c10be07dea89d0edca138f3:xgboost/deps/xgboost \ + dmlc:dmlc-core:8986b0598df709117570984571476c3614f55724:dmlc_core/deps/xgboost/dmlc-core \ + rapidsai:gputreeshap:40eae8c4c45974705f8053e4d3d05b88e3cfaefd:gputreeshap//deps/xgboost/gputreeshap \ + google:googletest:56efe3983185e3f37e43415d1afa97e3860f187f:googletest/deps/googletest USE_LDCONFIG= yes MAKE_ARGS= ZL_JOBS=${MAKE_JOBS_NUMBER} CFLAGS_i386= -msse2 -LDFLAGS+= -pthread +LDFLAGS+= -pthread -lexecinfo PORTDOCS= CHANGELOG CONTRIBUTING.md README.md OPTIONS_DEFINE= DOCS -GOOGLETEST_VER= 1.17.0 -ZSTD_VER= 1.5.7 -DISTFILE_GOOGLETEST= googletest-${GOOGLETEST_VER}${EXTRACT_SUFX} - -post-extract: - @${CP} ${DISTDIR}/${DISTFILE_GOOGLETEST} \ - ${WRKSRC}/deps/googletest${EXTRACT_SUFX} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zli ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include cd ${WRKSRC}/cpp/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libopenzl.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libopenzl.so ${STAGEDIR}${PREFIX}/lib do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./gtests .include diff --git a/archivers/openzl/distinfo b/archivers/openzl/distinfo index e64ebee57f02..22d4f9869238 100644 --- a/archivers/openzl/distinfo +++ b/archivers/openzl/distinfo @@ -1,7 +1,15 @@ -TIMESTAMP = 1760386552 -SHA256 (googletest-1.17.0.tar.gz) = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c -SIZE (googletest-1.17.0.tar.gz) = 885595 -SHA256 (facebook-openzl-v0.1.0_GH0.tar.gz) = 3278546dcdbae3aef3887f07b435ebe0aa9f6943a5ac74cf9b7baeefe6526c2e -SIZE (facebook-openzl-v0.1.0_GH0.tar.gz) = 14437924 -SHA256 (facebook-zstd-v1.5.7_GH0.tar.gz) = 37d7284556b20954e56e1ca85b80226768902e2edabd3b649e9e72c0c9012ee3 -SIZE (facebook-zstd-v1.5.7_GH0.tar.gz) = 2451884 +TIMESTAMP = 1778987740 +SHA256 (facebook-openzl-v0.2.0_GH0.tar.gz) = 2ad14ed9af63d4a70cb05df5d5629871d052371ad017cf5559dc76c41ae3865f +SIZE (facebook-openzl-v0.2.0_GH0.tar.gz) = 18231513 +SHA256 (facebook-zstd-f8745da6ff1ad1e7bab384bd1f9d742439278e99_GH0.tar.gz) = 4b0bd1f0cfb25e61b9103c35f27395530ff5b4c0d2513a00fd745849e85ea52c +SIZE (facebook-zstd-f8745da6ff1ad1e7bab384bd1f9d742439278e99_GH0.tar.gz) = 2453329 +SHA256 (lz4-lz4-ebb370ca83af193212df4dcbadcc5d87bc0de2f0_GH0.tar.gz) = eb1a93e934d4fd29df6e2061ba0bf447568561764d758f4a5662c0e29370ffa9 +SIZE (lz4-lz4-ebb370ca83af193212df4dcbadcc5d87bc0de2f0_GH0.tar.gz) = 387536 +SHA256 (dmlc-xgboost-ccb511768e13d1670c10be07dea89d0edca138f3_GH0.tar.gz) = 8c1d333cc4a644cebd93e72f6371329a81a713b74cfd235fb4ebaad9ad28d659 +SIZE (dmlc-xgboost-ccb511768e13d1670c10be07dea89d0edca138f3_GH0.tar.gz) = 2387204 +SHA256 (dmlc-dmlc-core-8986b0598df709117570984571476c3614f55724_GH0.tar.gz) = 165ea73682f4a11fdea686c2ebd213eed42af69d0128896cc58da5661b0dfe3a +SIZE (dmlc-dmlc-core-8986b0598df709117570984571476c3614f55724_GH0.tar.gz) = 265195 +SHA256 (rapidsai-gputreeshap-40eae8c4c45974705f8053e4d3d05b88e3cfaefd_GH0.tar.gz) = 1698fb9185e7a659626996a42e18ca9a408b2dc94c2fb4769a27998c30bb2e67 +SIZE (rapidsai-gputreeshap-40eae8c4c45974705f8053e4d3d05b88e3cfaefd_GH0.tar.gz) = 64400 +SHA256 (google-googletest-56efe3983185e3f37e43415d1afa97e3860f187f_GH0.tar.gz) = 20f265f7346b6a542a49ea6fa0866f82e00841f2a7c2bc41d51014e662041cf9 +SIZE (google-googletest-56efe3983185e3f37e43415d1afa97e3860f187f_GH0.tar.gz) = 890093 diff --git a/archivers/openzl/files/patch-Makefile b/archivers/openzl/files/patch-Makefile deleted file mode 100644 index 58b2d35aa8f0..000000000000 --- a/archivers/openzl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig 2025-10-08 09:05:16 UTC -+++ Makefile -@@ -92,8 +92,8 @@ SDDL_COMPILER_CXXOBJS := $(filter-out %main.o, $(call - TRAINING_TEST_CXXOBJS := $(call cxx_objs,$(TRAINING_TEST_DIRS)) - SDDL_COMPILER_CXXOBJS := $(filter-out %main.o, $(call cxx_objs,$(SDDL_COMPILER_DIR))) - --zli: CFLAGS += -O3 --zli: CXXFLAGS += -O3 -+zli: CFLAGS += -+zli: CXXFLAGS += - $(eval $(call cxx_program,zli, \ - cli/zli.o \ - $(CLI_CXXOBJS) \ diff --git a/archivers/openzl/files/patch-build_make_zldefs.make b/archivers/openzl/files/patch-build-scripts_make_zldefs.make similarity index 83% rename from archivers/openzl/files/patch-build_make_zldefs.make rename to archivers/openzl/files/patch-build-scripts_make_zldefs.make index 3ad45b9ce3c2..a696654ae447 100644 --- a/archivers/openzl/files/patch-build_make_zldefs.make +++ b/archivers/openzl/files/patch-build-scripts_make_zldefs.make @@ -1,13 +1,13 @@ ---- build/make/zldefs.make.orig 2025-10-08 08:51:15 UTC -+++ build/make/zldefs.make +--- build-scripts/make/zldefs.make.orig 2026-05-17 03:17:57 UTC ++++ build-scripts/make/zldefs.make @@ -21,8 +21,8 @@ CPPFLAGS += -I. -Iinclude -Isrc -Icpp/include -Icpp/sr # base compilation flags CPPFLAGS += -I. -Iinclude -Isrc -Icpp/include -Icpp/src -CFLAGS += -O1 -std=c11 # code must be compliant with C11 -CXXFLAGS += -O1 -std=c++1z # for gtests +CFLAGS += -std=c11 # code must be compliant with C11 +CXXFLAGS += -std=c++1z # for gtests DEBUGFLAGS ?= -g \ -Wall -Wcast-qual -Wcast-align -Wshadow \ -Wstrict-aliasing=1 -Wundef -Wpointer-arith -Wvla -Wformat=2 \ diff --git a/archivers/openzl/files/patch-src_openzl_shared_portability.h b/archivers/openzl/files/patch-src_openzl_shared_portability.h index d15f9c837dde..3b26c659ed83 100644 --- a/archivers/openzl/files/patch-src_openzl_shared_portability.h +++ b/archivers/openzl/files/patch-src_openzl_shared_portability.h @@ -1,15 +1,15 @@ ---- src/openzl/shared/portability.h.orig 2025-10-08 09:01:34 UTC +--- src/openzl/shared/portability.h.orig 2026-05-17 02:41:49 UTC +++ src/openzl/shared/portability.h -@@ -211,10 +211,11 @@ ZL_BEGIN_C_DECLS - // Detect IEEE 754 floating point support. +@@ -330,10 +330,11 @@ typedef __m128i __m128i_u; // Apple doesn't define __STDC_IEC_559__, but supports IEEE 754. // MinGW doesn't define __STDC_IEC_559__, but supports IEEE 754. + // MSVC on x86/x64 supports IEEE 754. +// FreeBSD doesn't define __STDC_IEC_559__, but supports IEEE 754. #if (defined(__STDC_IEC_559__) && __STDC_IEC_559__) \ || (defined(__STDC_IEC_60559_BFP__) \ && __STDC_IEC_60559_BFP__ >= 202311L) \ -- || defined(__APPLE__) || defined(__MINGW32__) -+ || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__) +- || defined(__APPLE__) || defined(__MINGW32__) || defined(_MSC_VER) ++ || defined(__APPLE__) || defined(__MINGW32__) || defined(_MSC_VER) || defined(__FreeBSD__) # define ZL_HAS_IEEE_754 1 #else # define ZL_HAS_IEEE_754 0 diff --git a/archivers/openzl/pkg-plist b/archivers/openzl/pkg-plist index 1ba27f928d89..dca2efce3cb7 100644 --- a/archivers/openzl/pkg-plist +++ b/archivers/openzl/pkg-plist @@ -1,146 +1,164 @@ bin/zli include/openzl/codecs/zl_ace.h include/openzl/codecs/zl_bitpack.h include/openzl/codecs/zl_bitpack_manual.md +include/openzl/codecs/zl_bitsplit.h include/openzl/codecs/zl_bitunpack.h include/openzl/codecs/zl_brute_force_selector.h include/openzl/codecs/zl_clustering.h include/openzl/codecs/zl_concat.h include/openzl/codecs/zl_concat_manual.md include/openzl/codecs/zl_constant.h include/openzl/codecs/zl_constant_manual.md include/openzl/codecs/zl_conversion.h include/openzl/codecs/zl_conversion_manual.md include/openzl/codecs/zl_dedup.h include/openzl/codecs/zl_delta.h include/openzl/codecs/zl_delta_manual.md include/openzl/codecs/zl_dispatch.h include/openzl/codecs/zl_dispatch_string_manual.md include/openzl/codecs/zl_divide_by.h include/openzl/codecs/zl_entropy.h include/openzl/codecs/zl_entropy_manual.md include/openzl/codecs/zl_field_lz.h include/openzl/codecs/zl_flatpack.h include/openzl/codecs/zl_float_deconstruct.h include/openzl/codecs/zl_float_deconstruct_manual.md include/openzl/codecs/zl_generic.h include/openzl/codecs/zl_illegal.h include/openzl/codecs/zl_interleave.h include/openzl/codecs/zl_interleave_manual.md +include/openzl/codecs/zl_lz.h +include/openzl/codecs/zl_lz4.h include/openzl/codecs/zl_merge_sorted.h +include/openzl/codecs/zl_mlselector.h +include/openzl/codecs/zl_mux_lengths.h include/openzl/codecs/zl_parse_int.h include/openzl/codecs/zl_parse_int_manual.md +include/openzl/codecs/zl_partition.h include/openzl/codecs/zl_prefix.h include/openzl/codecs/zl_prefix.md include/openzl/codecs/zl_quantize.h include/openzl/codecs/zl_range_pack.h include/openzl/codecs/zl_range_pack.md include/openzl/codecs/zl_sddl.h include/openzl/codecs/zl_sddl.md +include/openzl/codecs/zl_sddl2.h +include/openzl/codecs/zl_segmenters.h +include/openzl/codecs/zl_sentinel.h include/openzl/codecs/zl_split.h include/openzl/codecs/zl_split_by_struct.h include/openzl/codecs/zl_store.h include/openzl/codecs/zl_tokenize.h include/openzl/codecs/zl_transpose.h include/openzl/codecs/zl_zigzag.h include/openzl/codecs/zl_zstd.h include/openzl/cpp/CCtx.hpp include/openzl/cpp/CParam.hpp include/openzl/cpp/Codecs.hpp include/openzl/cpp/CompressIntrospectionHooks.hpp include/openzl/cpp/Compressor.hpp include/openzl/cpp/Config.hpp include/openzl/cpp/CustomCodecDescription.hpp include/openzl/cpp/CustomDecoder.hpp include/openzl/cpp/CustomEncoder.hpp include/openzl/cpp/DCtx.hpp +include/openzl/cpp/DecompressIntrospectionHooks.hpp include/openzl/cpp/Exception.hpp include/openzl/cpp/FrameInfo.hpp include/openzl/cpp/FunctionGraph.hpp include/openzl/cpp/Input.hpp include/openzl/cpp/LocalParams.hpp include/openzl/cpp/Output.hpp include/openzl/cpp/Selector.hpp include/openzl/cpp/Type.hpp include/openzl/cpp/codecs/ACE.hpp include/openzl/cpp/codecs/Bitpack.hpp +include/openzl/cpp/codecs/Bitsplit.hpp include/openzl/cpp/codecs/Bitunpack.hpp include/openzl/cpp/codecs/BruteForce.hpp include/openzl/cpp/codecs/Compress.hpp include/openzl/cpp/codecs/Concat.hpp include/openzl/cpp/codecs/Constant.hpp include/openzl/cpp/codecs/Conversion.hpp include/openzl/cpp/codecs/Dedup.hpp include/openzl/cpp/codecs/Delta.hpp include/openzl/cpp/codecs/Dispatch.hpp include/openzl/cpp/codecs/DivideBy.hpp include/openzl/cpp/codecs/Entropy.hpp include/openzl/cpp/codecs/FieldLz.hpp include/openzl/cpp/codecs/Flatpack.hpp include/openzl/cpp/codecs/FloatDeconstruct.hpp include/openzl/cpp/codecs/Graph.hpp include/openzl/cpp/codecs/Illegal.hpp +include/openzl/cpp/codecs/Lz.hpp +include/openzl/cpp/codecs/Lz4.hpp include/openzl/cpp/codecs/MergeSorted.hpp include/openzl/cpp/codecs/Metadata.hpp +include/openzl/cpp/codecs/MuxLengths.hpp include/openzl/cpp/codecs/Node.hpp include/openzl/cpp/codecs/ParseInt.hpp +include/openzl/cpp/codecs/Partition.hpp include/openzl/cpp/codecs/Prefix.hpp include/openzl/cpp/codecs/Quantize.hpp include/openzl/cpp/codecs/RangePack.hpp include/openzl/cpp/codecs/SDDL.hpp +include/openzl/cpp/codecs/SDDL2.hpp +include/openzl/cpp/codecs/SegmentSerial.hpp +include/openzl/cpp/codecs/Sentinel.hpp include/openzl/cpp/codecs/Split.hpp include/openzl/cpp/codecs/SplitByStruct.hpp include/openzl/cpp/codecs/Store.hpp include/openzl/cpp/codecs/Tokenize.hpp include/openzl/cpp/codecs/Transpose.hpp include/openzl/cpp/codecs/Zigzag.hpp include/openzl/cpp/codecs/Zstd.hpp include/openzl/cpp/detail/NonNullUniqueCPtr.hpp include/openzl/cpp/detail/Portability.hpp include/openzl/cpp/poly/Byte.hpp include/openzl/cpp/poly/Iterator.hpp include/openzl/cpp/poly/Optional.hpp include/openzl/cpp/poly/SourceLocation.hpp include/openzl/cpp/poly/Span.hpp include/openzl/cpp/poly/StringView.hpp include/openzl/cpp/poly/TypeTraits.hpp include/openzl/detail/zl_error_context.h include/openzl/detail/zl_errors_detail.h include/openzl/openzl.h include/openzl/openzl.hpp include/openzl/zl_buffer.h -include/openzl/zl_cgraph.h include/openzl/zl_common_types.h include/openzl/zl_compress.h include/openzl/zl_compressor.h include/openzl/zl_compressor_serialization.h include/openzl/zl_config.h include/openzl/zl_ctransform.h include/openzl/zl_ctransform_legacy.h include/openzl/zl_data.h include/openzl/zl_decompress.h +include/openzl/zl_dict.h include/openzl/zl_dtransform.h include/openzl/zl_dtransform_legacy.h -include/openzl/zl_dyngraph.h include/openzl/zl_errors.h include/openzl/zl_errors_types.h include/openzl/zl_graph_api.h include/openzl/zl_graphs.h include/openzl/zl_input.h include/openzl/zl_introspection.h include/openzl/zl_localParams.h include/openzl/zl_macro_helpers.h +include/openzl/zl_materializer.h include/openzl/zl_nodes.h include/openzl/zl_opaque_types.h include/openzl/zl_output.h include/openzl/zl_portability.h include/openzl/zl_public_nodes.h include/openzl/zl_reflection.h include/openzl/zl_segmenter.h include/openzl/zl_selector.h include/openzl/zl_selector_declare_helper.h include/openzl/zl_selector_declare_helper_macro_utils.h -include/openzl/zl_stream.h +include/openzl/zl_unique_id.h include/openzl/zl_version.h lib/libopenzl.a lib/libopenzl.so