Updated freetype bundle to version 2.9.1.

Updated HarfBuzz bundle to version 2.2.0, this update slightly improve performance of text shaping.
carlinux · Dec 16, 2018 · fff16f0 · fff16f0
1 parent a3057b9
commit fff16f0
Show file tree

Hide file tree

Showing 528 changed files with 68,221 additions and 86,752 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -227,6 +227,7 @@ endif (NOT FREETYPE_FOUND)
 if (NOT HarfBuzz_FOUND)
   message("System HarfBuzz not found, will build local one\n")
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
+  SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
   ADD_SUBDIRECTORY(thirdparty/harfbuzz)
   SET(HARFBUZZ_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/harfbuzz/src)
   SET(HARFBUZZ_LIBRARY harfbuzz)

diff --git a/android/app/thirdparty_libs/harfbuzz/Android.mk b/android/app/thirdparty_libs/harfbuzz/Android.mk
@@ -22,6 +22,7 @@ LOCAL_CFLAGS += -funwind-tables -Wl,--no-merge-exidx-entries
 
 LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-aat-layout.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-aat-map.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-blob.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-buffer-serialize.cc \
@@ -30,11 +31,15 @@ LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-fallback-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-font.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ft.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-map.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-color.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-face.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-font.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-layout.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-map.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-math.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-name.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-name-language.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-arabic.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-default.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hangul.cc \
@@ -44,9 +49,9 @@ LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-khmer.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-myanmar.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-thai.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-tibetan.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use-table.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-vowel-constraints.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-fallback.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-normalize.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape.cc \
@@ -56,6 +61,7 @@ LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-shape-plan.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-shaper.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-static.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ucdn.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-unicode.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-warning.cc \

diff --git a/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt b/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt
@@ -12,6 +12,7 @@ add_definitions(-DHAVE_CONFIG_H=1)
 
 set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-aat-layout.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-aat-map.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-blob.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-buffer.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-buffer-serialize.cc
@@ -20,11 +21,15 @@ set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-fallback-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-font.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ft.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-map.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-color.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-face.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-font.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-layout.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-map.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-math.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-name.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-name-language.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-arabic.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-default.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-hangul.cc
@@ -34,9 +39,9 @@ set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-khmer.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-myanmar.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-thai.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-tibetan.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use-table.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-vowel-constraints.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-fallback.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-normalize.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape.cc
@@ -46,6 +51,7 @@ set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-shape-plan.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-shaper.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-static.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ucdn.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-unicode.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-warning.cc

diff --git a/android/app/thirdparty_libs/harfbuzz/config.h b/android/app/thirdparty_libs/harfbuzz/config.h
@@ -16,6 +16,10 @@
 /* Have Core Text backend */
 /* #undef HAVE_CORETEXT */
 
+/* Define to 1 if you have the declaration of `round', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_ROUND */
+
 /* Have DirectWrite library */
 /* #undef HAVE_DIRECTWRITE */
 
@@ -82,27 +86,30 @@
 /* Define to 1 if you have the `newlocale' function. */
 /* #undef HAVE_NEWLOCALE */
 
-/* Have native OpenType Layout backend */
-#define HAVE_OT 1
+/* Define to 1 if you have the `posix_memalign' function. */
+/* #undef HAVE_POSIX_MEMALIGN */
 
 /* Have POSIX threads */
 #define HAVE_PTHREAD 1
 
 /* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+
+/* Define to 1 if you have the `round' function. */
+#define HAVE_ROUND 1
 
 /* Define to 1 if you have the <sched.h> header file. */
 /* #undef HAVE_SCHED_H */
 
 /* Have sched_yield */
 /* #undef HAVE_SCHED_YIELD */
 
-/* Define to 1 if you have the `setlinebuf' function. */
-#define HAVE_SETLINEBUF 1
-
 /* Have Solaris __machine_*_barrier and atomic_* operations */
 /* #undef HAVE_SOLARIS_ATOMIC_OPS */
 
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -158,7 +165,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 1.7.6"
+#define PACKAGE_STRING "HarfBuzz 2.2.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -167,7 +174,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.6"
+#define PACKAGE_VERSION "2.2.0"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */