Updates from koreader/crengine

CMakeLists.txt

@@ -215,6 +215,7 @@ endif(NOT MAC)
 
 if (NOT ${GUI} STREQUAL FB2PROPS )
 if (NOT MAC)
+
 if (NOT MSVC AND NOT CR3_PNG)
 FIND_PACKAGE(PNG)
 endif (NOT MSVC AND NOT CR3_PNG)
@@ -306,6 +307,20 @@ if (NOT LIBUNIBREAK_FOUND)
   SET(LIBUNIBREAK_LIBRARIES unibreak)
 endif (NOT LIBUNIBREAK_FOUND)
 
+find_package(ZSTD)
+if (NOT ZSTD_FOUND)
+    message("\nSystem zstd not found, will build local one\n")
+    set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE)
+    set(ZSTD_MULTITHREAD_SUPPORT OFF CACHE BOOL "MULTITHREADING SUPPORT" FORCE)
+    set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "BUILD PROGRAMS" FORCE)
+    set(ZSTD_BUILD_CONTRIB OFF CACHE BOOL "BUILD CONTRIB" FORCE)
+    set(ZSTD_BUILD_TESTS OFF CACHE BOOL "BUILD TESTS" FORCE)
+    set(ZSTD_BUILD_STATIC ON CACHE BOOL "BUILD STATIC LIBRARIES" FORCE)
+    set(ZSTD_BUILD_SHARED OFF CACHE BOOL "BUILD SHARED LIBRARIES" FORCE)
+    add_subdirectory(thirdparty/${REPO_ZSTD_SRCDIR}/build/cmake)
+    SET(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_ZSTD_SRCDIR}/lib CACHE PATH "Include directories needed to use ZSTD" FORCE)
+    SET(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "Libraries needed to link to ZSTD" FORCE)
+endif(NOT ZSTD_FOUND)
 
 endif (NOT MAC)
 
@@ -339,6 +354,7 @@ INCLUDE_DIRECTORIES(
   ${CHM_INCLUDE_DIR}
   ${FRIBIDI_INCLUDE_DIR}
   ${LIBUNIBREAK_INCLUDE_DIR}
+  ${ZSTD_INCLUDE_DIRS}
 )
 
 if ( ${GUI} STREQUAL FB2PROPS )
@@ -357,6 +373,7 @@ SET(STD_LIBS
   ${ANTIWORD_LIBRARIES}
   ${FRIBIDI_LIBRARIES}
   ${LIBUNIBREAK_LIBRARIES}
+  ${ZSTD_LIBRARIES}
   qimagescale
 )
 if (FONTCONFIG_FOUND)

android/app/CMakeLists.txt

@@ -27,6 +27,7 @@ include_directories(${CR3_ROOT}/thirdparty_unman/nanosvg/src)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_FRIBIDI_SRCDIR}/lib)
 include_directories(thirdparty_libs/fribidi/lib)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src)
+include_directories(${CR3_ROOT}/thirdparty/${REPO_ZSTD_SRCDIR}/lib)
 
 add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
 add_definitions(-DFT_CONFIG_MODULES_H=<android/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<android/config/ftoption.h>)
@@ -90,6 +91,7 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/lvrend.cpp
     ${CR3_ROOT}/crengine/src/wolutil.cpp
     ${CR3_ROOT}/crengine/src/crconcurrent.cpp
+    ${CR3_ROOT}/crengine/src/mathml.cpp
     ${CR3_ROOT}/crengine/src/hist.cpp
     ${CR3_ROOT}/crengine/src/xxhash.c
     ${CR3_ROOT}/crengine/src/textlang.cpp
@@ -122,6 +124,7 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/lvdrawbuf/lvbasedrawbuf.cpp
     ${CR3_ROOT}/crengine/src/lvdrawbuf/lvgraydrawbuf.cpp
     ${CR3_ROOT}/crengine/src/lvdrawbuf/lvcolordrawbuf.cpp
+    ${CR3_ROOT}/crengine/src/lvdrawbuf/lvinkmeasurementdrawbuf.cpp
     ${CR3_ROOT}/crengine/src/lvdrawbuf/lvimagescaleddrawcallback.cpp
     ${CR3_ROOT}/crengine/src/lvdrawbuf/lvdrawbuf_utils.cpp
     ${CR3_ROOT}/crengine/src/lvstream/lvdefstreambuffer.cpp
@@ -211,20 +214,21 @@ find_library( # Sets the name of the path variable.
 # build script, prebuilt third-party libraries, or system libraries.
 
 target_link_libraries( # Specifies the target library.
-                       cr3engine-3-2-X
-
-                       # thirdparty static libs
-                       png
-                       jpeg
-                       freetype
-                       harfbuzz
-                       chmlib
-                       antiword
-                       fribidi
-                       unibreak
-                       qimagescale
-
-                       # Links the target library to the log library
-                       # included in the NDK.
-                       ${log-lib}
-                       -lm -lz -ldl)
+        cr3engine-3-2-X
+
+        # thirdparty static libs
+        local_png
+        local_jpeg
+        local_freetype
+        local_harfbuzz
+        local_chmlib
+        local_antiword
+        local_fribidi
+        local_unibreak
+        local_qimagescale
+        local_zstd
+
+        # Links the target library to the log library
+        # included in the NDK.
+        ${log-lib}
+        -lm -lz -ldl)

android/app/thirdparty_libs/CMakeLists.txt

@@ -8,3 +8,4 @@ add_subdirectory(antiword)
 add_subdirectory(fribidi)
 add_subdirectory(libunibreak)
 add_subdirectory(qimagescale)
+add_subdirectory(zstd)

android/app/thirdparty_libs/antiword/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(antiword)
+project(local_antiword)
 
 set(ANTIWORD_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty_unman/antiword)
 
@@ -52,4 +52,4 @@ set(ANTIWORD_SRC_FILES
     ${ANTIWORD_SRC_DIR}/xmalloc.c
 )
 
-add_library(antiword STATIC ${ANTIWORD_SRC_FILES})
+add_library(local_antiword STATIC ${ANTIWORD_SRC_FILES})

android/app/thirdparty_libs/chmlib/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(chmlib)
+project(local_chmlib)
 
 set(CHM_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty_unman/chmlib)
 
@@ -10,4 +10,4 @@ set(CHM_SRC_FILES
     ${CHM_SRC_DIR}/src/lzx.c
 )
 
-add_library(chmlib STATIC ${CHM_SRC_FILES})
+add_library(local_chmlib STATIC ${CHM_SRC_FILES})

android/app/thirdparty_libs/freetype/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(freetype)
+project(local_freetype)
 
 set(FREETYPE_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_FREETYPE_SRCDIR})
 set(FREETYPE_CONFIG_DIR ${PROJECT_SOURCE_DIR})
@@ -42,4 +42,4 @@ set(FREETYPE_SRC_FILES
 #   ${FREETYPE_SRC_DIR}/src/gxvalid/gxvalid.c
 #   ${FREETYPE_SRC_DIR}/src/otvalid/otvalid.c
 
-add_library(freetype STATIC ${FREETYPE_SRC_FILES})
+add_library(local_freetype STATIC ${FREETYPE_SRC_FILES})

android/app/thirdparty_libs/fribidi/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(fribidi C)
+project(local_fribidi C)
 
 cmake_minimum_required(VERSION 3.4)
 
@@ -31,4 +31,4 @@ set(FRIBIDI_SOURCE
 		${FRIBIDI_SOURCE_DIR}/lib/fribidi-shape.c
 )
 
-add_library(fribidi STATIC ${FRIBIDI_SOURCE})
+add_library(local_fribidi STATIC ${FRIBIDI_SOURCE})

android/app/thirdparty_libs/harfbuzz/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(harfbuzz)
+project(local_harfbuzz)
 
 set(HARFBUZZ_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_HARFBUZZ_SRCDIR})
 set(HARFBUZZ_CONFIG_DIR ${PROJECT_SOURCE_DIR})
@@ -61,4 +61,4 @@ set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-unicode.cc
 )
 
-add_library(harfbuzz STATIC ${HARFBUZZ_SRC_FILES})
+add_library(local_harfbuzz STATIC ${HARFBUZZ_SRC_FILES})

android/app/thirdparty_libs/libjpeg/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(jpeg)
+project(local_jpeg)
 
 set(JPEG_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_LIBJPEG_SRCDIR})
 
@@ -54,4 +54,4 @@ set(JPEG_SRC_FILES
     ${JPEG_SRC_DIR}/jmemnobs.c
 )
 
-add_library(jpeg STATIC ${JPEG_SRC_FILES})
+add_library(local_jpeg STATIC ${JPEG_SRC_FILES})

android/app/thirdparty_libs/libpng/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(png)
+project(local_png)
 
 set(PNG_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_LIBPNG_SRCDIR})
 set(PNG_CONFIG_DIR ${PROJECT_SOURCE_DIR})
@@ -103,4 +103,4 @@ set(PNG_SRC_FILES
     ${libpng_intel_sources}
 )
 
-add_library(png STATIC ${PNG_SRC_FILES})
+add_library(local_png STATIC ${PNG_SRC_FILES})

android/app/thirdparty_libs/libunibreak/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(unibreak C)
+project(local_unibreak C)
 
 cmake_minimum_required(VERSION 3.4)
 
@@ -17,4 +17,4 @@ set(LIBUNIBREAK_SOURCE
 	${LIBUNIBREAK_SOURCE_DIR}/wordbreak.c
 )
 
-add_library(unibreak STATIC ${LIBUNIBREAK_SOURCE})
+add_library(local_unibreak STATIC ${LIBUNIBREAK_SOURCE})

android/app/thirdparty_libs/qimagescale/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-project(qimagescale)
+project(local_qimagescale)
 
 set(QIMAGESCALE_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty_unman/qimagescale)
 
@@ -9,4 +9,4 @@ set(QIMAGESCALE_SRC_FILES
     ${QIMAGESCALE_SRC_DIR}/qimagescale.cpp
 )
 
-add_library(qimagescale STATIC ${QIMAGESCALE_SRC_FILES})
+add_library(local_qimagescale STATIC ${QIMAGESCALE_SRC_FILES})

android/app/thirdparty_libs/zstd/Android.mk

@@ -0,0 +1,47 @@
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := local_zstd
+
+ZSTD_SRC_DIR := ../../../../thirdparty/$(REPO_ZSTD_SRCDIR)
+ZSTD_SRC_DIR_P := $(LOCAL_PATH)/../../../../thirdparty/$(REPO_ZSTD_SRCDIR)
+
+LOCAL_C_INCLUDES := $(ZSTD_SRC_DIR_P)
+LOCAL_CFLAGS += -funwind-tables -Wl,--no-merge-exidx-entries
+
+LOCAL_CFLAGS += -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=0 -UZSTD_MULTITHREAD -DZSTD_NO_TRACE -DZSTD_TRACE=0
+
+LOCAL_SRC_FILES := \
+    $(ZSTD_SRC_DIR)/lib/common/debug.c \
+    $(ZSTD_SRC_DIR)/lib/common/entropy_common.c \
+    $(ZSTD_SRC_DIR)/lib/common/error_private.c \
+    $(ZSTD_SRC_DIR)/lib/common/fse_decompress.c \
+    $(ZSTD_SRC_DIR)/lib/common/pool.c \
+    $(ZSTD_SRC_DIR)/lib/common/threading.c \
+    $(ZSTD_SRC_DIR)/lib/common/xxhash.c \
+    $(ZSTD_SRC_DIR)/lib/common/zstd_common.c \
+    $(ZSTD_SRC_DIR)/lib/compress/fse_compress.c \
+    $(ZSTD_SRC_DIR)/lib/compress/hist.c \
+    $(ZSTD_SRC_DIR)/lib/compress/huf_compress.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_compress.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_compress_literals.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_compress_sequences.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_compress_superblock.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_double_fast.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_fast.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_lazy.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_ldm.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstd_opt.c \
+    $(ZSTD_SRC_DIR)/lib/compress/zstdmt_compress.c \
+    $(ZSTD_SRC_DIR)/lib/decompress/huf_decompress.c \
+    $(ZSTD_SRC_DIR)/lib/decompress/zstd_ddict.c \
+    $(ZSTD_SRC_DIR)/lib/decompress/zstd_decompress.c \
+    $(ZSTD_SRC_DIR)/lib/decompress/zstd_decompress_block.c \
+    $(ZSTD_SRC_DIR)/lib/dictBuilder/cover.c \
+    $(ZSTD_SRC_DIR)/lib/dictBuilder/divsufsort.c \
+    $(ZSTD_SRC_DIR)/lib/dictBuilder/fastcover.c \
+    $(ZSTD_SRC_DIR)/lib/dictBuilder/zdict.c
+
+include $(BUILD_STATIC_LIBRARY)

android/app/thirdparty_libs/zstd/CMakeLists.txt

@@ -0,0 +1,45 @@
+
+project(local_zstd)
+
+set(ZSTD_SRC_DIR ${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_ZSTD_SRCDIR})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_definitions(-DXXH_NAMESPACE=ZSTD_)
+add_definitions(-DZSTD_LEGACY_SUPPORT=0)
+add_definitions(-UZSTD_MULTITHREAD)
+add_definitions(-DZSTD_NO_TRACE -DZSTD_TRACE=0)
+
+set(ZSTD_SRC_FILES
+    ${ZSTD_SRC_DIR}/lib/common/debug.c
+    ${ZSTD_SRC_DIR}/lib/common/entropy_common.c
+    ${ZSTD_SRC_DIR}/lib/common/error_private.c
+    ${ZSTD_SRC_DIR}/lib/common/fse_decompress.c
+    ${ZSTD_SRC_DIR}/lib/common/pool.c
+    ${ZSTD_SRC_DIR}/lib/common/threading.c
+    ${ZSTD_SRC_DIR}/lib/common/xxhash.c
+    ${ZSTD_SRC_DIR}/lib/common/zstd_common.c
+    ${ZSTD_SRC_DIR}/lib/compress/fse_compress.c
+    ${ZSTD_SRC_DIR}/lib/compress/hist.c
+    ${ZSTD_SRC_DIR}/lib/compress/huf_compress.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_compress.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_compress_literals.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_compress_sequences.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_compress_superblock.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_double_fast.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_fast.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_lazy.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_ldm.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstd_opt.c
+    ${ZSTD_SRC_DIR}/lib/compress/zstdmt_compress.c
+    ${ZSTD_SRC_DIR}/lib/decompress/huf_decompress.c
+    ${ZSTD_SRC_DIR}/lib/decompress/zstd_ddict.c
+    ${ZSTD_SRC_DIR}/lib/decompress/zstd_decompress.c
+    ${ZSTD_SRC_DIR}/lib/decompress/zstd_decompress_block.c
+    ${ZSTD_SRC_DIR}/lib/dictBuilder/cover.c
+    ${ZSTD_SRC_DIR}/lib/dictBuilder/divsufsort.c
+    ${ZSTD_SRC_DIR}/lib/dictBuilder/fastcover.c
+    ${ZSTD_SRC_DIR}/lib/dictBuilder/zdict.c
+)
+
+add_library(local_zstd STATIC ${ZSTD_SRC_FILES})

android/jni/Android.mk

@@ -36,6 +36,7 @@ LOCAL_C_INCLUDES := \
     $(CR3_ROOT)/thirdparty_unman/nanosvg/src \
     $(CR3_ROOT)/thirdparty/$(REPO_FRIBIDI_SRCDIR)/lib \
     $(CR3_ROOT)/thirdparty/$(REPO_LIBUNIBREAK_SRCDIR)/src \
+    $(CR3_ROOT)/thirdparty/$(REPO_ZSTD_SRCDIR)/lib \
     $(CR3_ROOT)/android/app/thirdparty_libs/freetype \
     $(CR3_ROOT)/android/app/thirdparty_libs/fribidi/lib \
     $(CR3_ROOT)/android/app/thirdparty_libs/libpng/lib
@@ -85,6 +86,7 @@ CRENGINE_SRC_FILES := \
     ../../crengine/src/lvrend.cpp \
     ../../crengine/src/wolutil.cpp \
     ../../crengine/src/crconcurrent.cpp \
+    ../../crengine/src/mathml.cpp \
     ../../crengine/src/hist.cpp \
     ../../crengine/src/xxhash.c \
     ../../crengine/src/textlang.cpp \
@@ -117,6 +119,7 @@ CRENGINE_SRC_FILES := \
     ../../crengine/src/lvdrawbuf/lvbasedrawbuf.cpp \
     ../../crengine/src/lvdrawbuf/lvgraydrawbuf.cpp \
     ../../crengine/src/lvdrawbuf/lvcolordrawbuf.cpp \
+    ../../crengine/src/lvdrawbuf/lvinkmeasurementdrawbuf.cpp \
     ../../crengine/src/lvdrawbuf/lvimagescaleddrawcallback.cpp \
     ../../crengine/src/lvdrawbuf/lvdrawbuf_utils.cpp \
     ../../crengine/src/lvstream/lvdefstreambuffer.cpp \
@@ -192,7 +195,8 @@ LOCAL_STATIC_LIBRARIES := \
     local_antiword \
     local_fribidi \
     local_libunibreak \
-    local_qimagescale
+    local_qimagescale \
+    local_zstd
 
 LOCAL_LDLIBS    := -lm -llog -lz -ldl -flto
 #