head 1.2; access; symbols netbsd-11-1-RELEASE:1.1.1.1.2.1 netbsd-11-0-RELEASE:1.1.1.1 netbsd-11-0-RC7:1.1.1.1 netbsd-11-0-RC6:1.1.1.1 netbsd-11-0-RC5:1.1.1.1 netbsd-11-0-RC4:1.1.1.1 netbsd-11-0-RC3:1.1.1.1 netbsd-11-0-RC2:1.1.1.1 netbsd-11-0-RC1:1.1.1.1 netbsd-11:1.1.1.1.0.2 netbsd-11-base:1.1.1.1 brotli-1-0-9:1.1.1.1 GOOGLE:1.1.1; locks; strict; comment @ * @; 1.2 date 2026.10.28.21.13.09; author mrg; state dead; branches; next 1.1; commitid WySy0JIemcP5Wh1H; 1.1 date 2023.01.29.06.38.34; author mrg; state Exp; branches 1.1.1.1; next ; commitid gOcuvoN6w4Ry1pbE; 1.1.1.1 date 2023.01.29.06.38.34; author mrg; state Exp; branches 1.1.1.1.2.1; next ; commitid gOcuvoN6w4Ry1pbE; 1.1.1.1.2.1 date 2026.10.29.16.03.51; author martin; state dead; branches; next ; commitid Zd6vMoBhuWqLbo1H; desc @@ 1.2 log @merge brotli 1.2.1. @ text @/* Copyright 2013 Google Inc. All Rights Reserved. Distributed under MIT license. See file LICENSE for detail or copy at https://opensource.org/licenses/MIT */ /* Functions to estimate the bit cost of Huffman trees. */ #ifndef BROTLI_ENC_BIT_COST_H_ #define BROTLI_ENC_BIT_COST_H_ #include "../common/platform.h" #include #include "./fast_log.h" #include "./histogram.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif static BROTLI_INLINE double ShannonEntropy( const uint32_t* population, size_t size, size_t* total) { size_t sum = 0; double retval = 0; const uint32_t* population_end = population + size; size_t p; if (size & 1) { goto odd_number_of_elements_left; } while (population < population_end) { p = *population++; sum += p; retval -= (double)p * FastLog2(p); odd_number_of_elements_left: p = *population++; sum += p; retval -= (double)p * FastLog2(p); } if (sum) retval += (double)sum * FastLog2(sum); *total = sum; return retval; } static BROTLI_INLINE double BitsEntropy( const uint32_t* population, size_t size) { size_t sum; double retval = ShannonEntropy(population, size, &sum); if (retval < sum) { /* At least one bit per literal is needed. */ retval = (double)sum; } return retval; } BROTLI_INTERNAL double BrotliPopulationCostLiteral(const HistogramLiteral*); BROTLI_INTERNAL double BrotliPopulationCostCommand(const HistogramCommand*); BROTLI_INTERNAL double BrotliPopulationCostDistance(const HistogramDistance*); #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ #endif #endif /* BROTLI_ENC_BIT_COST_H_ */ @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of brotli 1.0.9. modern blender wants freetype to have brotli support enabled or it won't build. fortunately, enabling the decoder support (all it needs currently) is relatively easy and small (~160k on amd64) without exposing brotli as a first class citizen is easy, so this will be linked into xsrc freetype directly. XXX: pullup-10? or perhaps force -10 to use pkgsrc freetype? from pkgsrc DESCR: Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio comparable to the best currently available general-purpose compression methods. It is similar in speed with deflate but offers more dense compression. @ text @@ 1.1.1.1.2.1 log @Pull up the following, requested by mrg in ticket #562: external/mit/brotli/dist/BUILD.bazel up to 1.1.1.1 external/mit/brotli/dist/c/common/dictionary_inc.h up to 1.1.1.1 external/mit/brotli/dist/c/common/shared_dictionary.c up to 1.1.1.1 external/mit/brotli/dist/c/common/shared_dictionary_internal.h up to 1.1.1.1 external/mit/brotli/dist/c/common/static_init.h up to 1.1.1.1 external/mit/brotli/dist/c/dec/prefix.c up to 1.1.1.1 external/mit/brotli/dist/c/dec/prefix_inc.h up to 1.1.1.1 external/mit/brotli/dist/c/dec/static_init.c up to 1.1.1.1 external/mit/brotli/dist/c/dec/static_init.h up to 1.1.1.1 external/mit/brotli/dist/c/include/brotli/shared_dictionary.h up to 1.1.1.1 external/mit/brotli/dist/docs/brotli.svg up to 1.1.1.1 external/mit/brotli/dist/scripts/download_testdata.sh up to 1.1.1.1 external/mit/brotli/dist/tests/testdata/zerosukkanooa.compressed up to 1.1.1.1 external/mit/brotli/dist/tests/cli_test.sh up to 1.1.1.1 external/mit/brotli/dist/SECURITY.md up to 1.1.1.1 external/mit/brotli/dist/.bazelignore up to 1.1.1.1 external/mit/brotli/dist/CHANGELOG.md up to 1.1.1.1 external/mit/brotli/dist/BUILD delete external/mit/brotli/dist/Makefile delete external/mit/brotli/dist/Makefile.am delete external/mit/brotli/dist/WORKSPACE delete external/mit/brotli/dist/bootstrap delete external/mit/brotli/dist/compiler_config_setting.bzl delete external/mit/brotli/dist/configure delete external/mit/brotli/dist/configure-cmake delete external/mit/brotli/dist/configure.ac delete external/mit/brotli/dist/premake5.lua delete external/mit/brotli/dist/c/enc/backward_references.c delete external/mit/brotli/dist/c/enc/backward_references.h delete external/mit/brotli/dist/c/enc/backward_references_hq.c delete external/mit/brotli/dist/c/enc/backward_references_hq.h delete external/mit/brotli/dist/c/enc/backward_references_inc.h delete external/mit/brotli/dist/c/enc/bit_cost.c delete external/mit/brotli/dist/c/enc/bit_cost.h delete external/mit/brotli/dist/c/enc/bit_cost_inc.h delete external/mit/brotli/dist/c/enc/block_encoder_inc.h delete external/mit/brotli/dist/c/enc/block_splitter.c delete external/mit/brotli/dist/c/enc/block_splitter.h delete external/mit/brotli/dist/c/enc/block_splitter_inc.h delete external/mit/brotli/dist/c/enc/brotli_bit_stream.c delete external/mit/brotli/dist/c/enc/brotli_bit_stream.h delete external/mit/brotli/dist/c/enc/cluster.c delete external/mit/brotli/dist/c/enc/cluster.h delete external/mit/brotli/dist/c/enc/cluster_inc.h delete external/mit/brotli/dist/c/enc/command.c delete external/mit/brotli/dist/c/enc/command.h delete external/mit/brotli/dist/c/enc/compress_fragment.c delete external/mit/brotli/dist/c/enc/compress_fragment.h delete external/mit/brotli/dist/c/enc/compress_fragment_two_pass.c delete external/mit/brotli/dist/c/enc/compress_fragment_two_pass.h delete external/mit/brotli/dist/c/enc/dictionary_hash.c delete external/mit/brotli/dist/c/enc/dictionary_hash.h delete external/mit/brotli/dist/c/enc/encode.c delete external/mit/brotli/dist/c/enc/encoder_dict.c delete external/mit/brotli/dist/c/enc/encoder_dict.h delete external/mit/brotli/dist/c/enc/entropy_encode.c delete external/mit/brotli/dist/c/enc/entropy_encode.h delete external/mit/brotli/dist/c/enc/entropy_encode_static.h delete external/mit/brotli/dist/c/enc/fast_log.c delete external/mit/brotli/dist/c/enc/fast_log.h delete external/mit/brotli/dist/c/enc/find_match_length.h delete external/mit/brotli/dist/c/enc/hash.h delete external/mit/brotli/dist/c/enc/hash_composite_inc.h delete external/mit/brotli/dist/c/enc/hash_forgetful_chain_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match64_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match_quickly_inc.h delete external/mit/brotli/dist/c/enc/hash_rolling_inc.h delete external/mit/brotli/dist/c/enc/hash_to_binary_tree_inc.h delete external/mit/brotli/dist/c/enc/histogram.c delete external/mit/brotli/dist/c/enc/histogram.h delete external/mit/brotli/dist/c/enc/histogram_inc.h delete external/mit/brotli/dist/c/enc/literal_cost.c delete external/mit/brotli/dist/c/enc/literal_cost.h delete external/mit/brotli/dist/c/enc/memory.c delete external/mit/brotli/dist/c/enc/memory.h delete external/mit/brotli/dist/c/enc/metablock.c delete external/mit/brotli/dist/c/enc/metablock.h delete external/mit/brotli/dist/c/enc/metablock_inc.h delete external/mit/brotli/dist/c/enc/params.h delete external/mit/brotli/dist/c/enc/prefix.h delete external/mit/brotli/dist/c/enc/quality.h delete external/mit/brotli/dist/c/enc/utf8_util.c delete external/mit/brotli/dist/c/enc/ringbuffer.h delete external/mit/brotli/dist/c/enc/static_dict.c delete external/mit/brotli/dist/c/enc/static_dict.h delete external/mit/brotli/dist/c/enc/static_dict_lut.h delete external/mit/brotli/dist/c/enc/utf8_util.h delete external/mit/brotli/dist/c/enc/write_bits.h delete external/mit/brotli/dist/python/Makefile delete external/mit/brotli/dist/python/README.md delete external/mit/brotli/dist/python/_brotli.cc delete external/mit/brotli/dist/python/bro.py delete external/mit/brotli/dist/python/brotli.py delete external/mit/brotli/dist/python/tests/__init__.py delete external/mit/brotli/dist/python/tests/_test_utils.py delete external/mit/brotli/dist/python/tests/bro_test.py delete external/mit/brotli/dist/python/tests/compress_test.py delete external/mit/brotli/dist/python/tests/compressor_test.py delete external/mit/brotli/dist/python/tests/decompress_test.py delete external/mit/brotli/dist/python/tests/decompressor_test.py delete external/mit/brotli/dist/scripts/sources.lst delete external/mit/brotli/dist/tests/Makefile delete external/mit/brotli/dist/tests/compatibility_test.sh delete external/mit/brotli/dist/tests/roundtrip_test.sh delete external/mit/brotli/dist/CMakeLists.txt up to 1.1.1.2 external/mit/brotli/dist/CONTRIBUTING.md up to 1.1.1.2 external/mit/brotli/dist/MANIFEST.in up to 1.1.1.2 external/mit/brotli/dist/README up to 1.1.1.2 external/mit/brotli/dist/README.md up to 1.1.1.2 external/mit/brotli/dist/setup.cfg up to 1.1.1.2 external/mit/brotli/dist/setup.py up to 1.1.1.2 external/mit/brotli/dist/c/common/constants.c up to 1.1.1.2 external/mit/brotli/dist/c/common/constants.h up to 1.1.1.2 external/mit/brotli/dist/c/common/context.c up to 1.1.1.2 external/mit/brotli/dist/c/common/context.h up to 1.1.1.2 external/mit/brotli/dist/c/common/dictionary.c up to 1.1.1.2 external/mit/brotli/dist/c/common/dictionary.h up to 1.1.1.2 external/mit/brotli/dist/c/common/platform.c up to 1.1.1.2 external/mit/brotli/dist/c/common/platform.h up to 1.2 external/mit/brotli/dist/c/common/transform.c up to 1.1.1.2 external/mit/brotli/dist/c/common/transform.h up to 1.1.1.2 external/mit/brotli/dist/c/common/version.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/bit_reader.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/bit_reader.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/decode.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/huffman.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/huffman.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/prefix.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/state.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/state.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/decode.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/encode.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/port.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/types.h up to 1.1.1.2 external/mit/brotli/dist/c/tools/brotli.c up to 1.1.1.2 external/mit/brotli/dist/c/tools/brotli.md up to 1.1.1.2 external/mit/brotli/dist/docs/brotli.1 up to 1.1.1.2 external/mit/brotli/dist/docs/constants.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/decode.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/encode.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/types.h.3 up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlicommon.pc.in up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlidec.pc.in up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlienc.pc.in up to 1.1.1.2 Initial import of brotli 1.2.1, that fixes CVE 2026-111497. @ text @@