Skip to content

Commit

Permalink
brotli: update to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
nemequ committed Jul 28, 2016
1 parent e965954 commit b34cee1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 52 deletions.
61 changes: 10 additions & 51 deletions plugins/brotli/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,56 +1,15 @@
include (SquashPlugin)

set (BROTLI_PLATFORM_DEFINES)
set(BROTLI_BUNDLED_MODE ON)
add_subdirectory(brotli)

if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list (APPEND BROTLI_PLATFORM_DEFINES "OS_LINUX")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
list (APPEND BROTLI_PLATFORM_DEFINES "OS_FREEBSD")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
list (APPEND BROTLI_PLATFORM_DEFINES "OS_MACOSX")
endif ()
if(CMAKE_VERSION VERSION_LESS 2.8.11)
include_directories(${BROTLI_INCLUDE_DIRS})
endif()

set_compiler_specific_flags(
VARIABLE embed_compiler_flags
MSVC
/wd4244
/wd4018
/wd4334)

squash_plugin (
NAME brotli
SQUASH_PLUGIN(
SOURCES squash-brotli.c
EMBED_SOURCES
brotli/enc/backward_references.c
brotli/enc/bit_cost.c
brotli/enc/block_splitter.c
brotli/enc/brotli_bit_stream.c
brotli/enc/cluster.c
brotli/enc/compress_fragment.c
brotli/enc/compress_fragment_two_pass.c
brotli/enc/encode.c
brotli/enc/entropy_encode.c
brotli/enc/histogram.c
brotli/enc/literal_cost.c
brotli/enc/memory.c
brotli/enc/metablock.c
brotli/enc/static_dict.c
brotli/enc/utf8_util.c
brotli/enc/compressor.cc
brotli/enc/encode_parallel.cc
brotli/enc/streams.cc
brotli/dec/bit_reader.c
brotli/dec/decode.c
brotli/dec/huffman.c
brotli/dec/state.c
brotli/common/dictionary.c
# COMPILER_FLAGS
# -Wno-cast-align
# -Wno-sign-compare
# EMBED_COMPILER_FLAGS
# ${embed_compiler_flags}
INCLUDE_DIRS brotli
EMBED_DEFINES
${BROTLI_PLATFORM_DEFINES}
NO_UNDEFINED_DEFINES
BROTLI_BUILD_PORTABLE)
NAME brotli
C_STANDARD c99
EMBED_TARGET brotli_enc brotli_dec brotli_common
INCLUDE_DIRS ${BROTLI_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion plugins/brotli/brotli
Submodule brotli updated 52 files
+46 −0 .travis.sh
+222 −20 .travis.yml
+152 −0 CMakeLists.txt
+9 −3 Makefile
+15 −0 common/types.h
+4 −4 dec/bit_reader.c
+14 −14 dec/bit_reader.h
+383 −304 dec/decode.c
+73 −46 dec/decode.h
+14 −26 dec/state.c
+17 −14 dec/state.h
+177 −195 enc/backward_references.c
+10 −18 enc/backward_references.h
+38 −47 enc/backward_references_inc.h
+5 −4 enc/block_splitter.c
+2 −1 enc/block_splitter.h
+8 −7 enc/block_splitter_inc.h
+10 −10 enc/brotli_bit_stream.c
+5 −5 enc/brotli_bit_stream.h
+3 −3 enc/cluster.c
+4 −4 enc/cluster_inc.h
+5 −4 enc/command.h
+13 −11 enc/compress_fragment.c
+1 −1 enc/compress_fragment.h
+12 −10 enc/compress_fragment_two_pass.c
+1 −1 enc/compress_fragment_two_pass.h
+4 −4 enc/compressor.cc
+233 −244 enc/encode.c
+32 −30 enc/encode.h
+28 −35 enc/encode_parallel.cc
+17 −16 enc/entropy_encode.c
+3 −2 enc/entropy_encode.h
+210 −126 enc/hash.h
+249 −0 enc/hash_forgetful_chain_inc.h
+35 −80 enc/hash_longest_match_inc.h
+53 −92 enc/hash_longest_match_quickly_inc.h
+2 −2 enc/memory.c
+1 −1 enc/memory.h
+11 −10 enc/metablock.c
+2 −1 enc/metablock.h
+3 −3 enc/metablock_inc.h
+1 −1 enc/port.h
+130 −0 enc/quality.h
+4 −1 enc/ringbuffer.h
+55 −57 enc/static_dict.c
+3 −4 enc/static_dict.h
+11,210 −12,028 enc/static_dict_lut.h
+4 −3 enc/utf8_util.c
+1 −1 enc/utf8_util.h
+28 −0 tests/run-compatibility-test.cmake
+35 −0 tests/run-roundtrip-test.cmake
+1 −1 tools/bro.c

0 comments on commit b34cee1

Please sign in to comment.