Merge pull request #272 from virxkane/thirdparty-harfbuzz-2.8.0

Update thirdparty library harfbuzz to version 2.8.0.
buggins · Mar 25, 2021 · 181f8fd · 181f8fd
2 parents af6c46c + 3540838
commit 181f8fd
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/android/app/thirdparty_libs/harfbuzz/Android.mk b/android/app/thirdparty_libs/harfbuzz/Android.mk
@@ -52,9 +52,9 @@ LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic-table.cc \
     $(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-syllabic.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-thai.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 \

diff --git a/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt b/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt
@@ -42,9 +42,9 @@ set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic-table.cc
     ${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-syllabic.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-thai.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

diff --git a/android/app/thirdparty_libs/harfbuzz/config.h b/android/app/thirdparty_libs/harfbuzz/config.h
@@ -35,7 +35,7 @@
 #define HAVE_FREETYPE 1
 
 /* Define to 1 if you have the `FT_Done_MM_Var' function. */
-/* #undef HAVE_FT_DONE_MM_VAR */
+#define HAVE_FT_DONE_MM_VAR 1
 
 /* Define to 1 if you have the `FT_Get_Var_Blend_Coordinates' function. */
 /* #undef HAVE_FT_GET_VAR_BLEND_COORDINATES */
@@ -64,9 +64,6 @@
 /* Use hb-icu Unicode callbacks */
 /* #undef HAVE_ICU_BUILTIN */
 
-/* Have Intel __sync_* atomic primitives */
-#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -88,15 +85,6 @@
 /* Have PTHREAD_PRIO_INHERIT. */
 #define HAVE_PTHREAD_PRIO_INHERIT 1
 
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Have sched_yield */
-/* #undef HAVE_SCHED_YIELD */
-
-/* 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
 
@@ -146,7 +134,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.7.4"
+#define PACKAGE_STRING "HarfBuzz 2.8.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -155,7 +143,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.7.4"
+#define PACKAGE_VERSION "2.8.0"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/thirdparty_repo/harfbuzz.meta.sh b/thirdparty_repo/harfbuzz.meta.sh
@@ -2,9 +2,9 @@
 # Metadata for deploy script
 
 PN="harfbuzz"
-PV="2.7.4"
+PV="2.8.0"
 SRCFILE="${PN}-${PV}.tar.xz"
-SHA512="d2af6a768c397c664f654cf36140e7b5696b3b983f637454604570c348247f7ffea135048d9b02cf6593cbde728567e31bf82a39df5ff38d680c78dff24d4cf0"
+SHA512="0ece78fa5c18be1fd693f40493ff3689a297ef4d5ad82f31054e8f42c1ba4e8b93afe1ed1ccb9eb9a0f165f8d1343c12c0606f1768a4f85bb041ae65018e6d83"
 
 URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${SRCFILE}"
 

diff --git a/thirdparty_repo/patches/harfbuzz/01-disable-install.patch b/thirdparty_repo/patches/harfbuzz/01-disable-install.patch
@@ -1,7 +1,7 @@
-diff -urBb harfbuzz-2.7.4-orig/CMakeLists.txt harfbuzz-2.7.4/CMakeLists.txt
---- harfbuzz-2.7.4-orig/CMakeLists.txt	2020-12-27 04:01:18.000000000 +0400
-+++ harfbuzz-2.7.4/CMakeLists.txt	2021-01-26 23:47:31.915012725 +0400
-@@ -691,79 +691,3 @@
+diff -urBb harfbuzz-2.8.0-orig/CMakeLists.txt harfbuzz-2.8.0/CMakeLists.txt
+--- harfbuzz-2.8.0-orig/CMakeLists.txt	2021-03-16 21:32:44.000000000 +0400
++++ harfbuzz-2.8.0/CMakeLists.txt	2021-03-23 08:26:48.249008717 +0400
+@@ -664,79 +664,3 @@
 
    mark_as_advanced(CAIRO_INCLUDE_DIRS CAIRO_LIBRARIESNAMES)
  endif ()

diff --git a/thirdparty_repo/repo_srcdirs.cmake b/thirdparty_repo/repo_srcdirs.cmake
@@ -5,7 +5,7 @@
 
 set(REPO_FREETYPE_SRCDIR "freetype-2.10.4")
 set(REPO_FRIBIDI_SRCDIR "fribidi-1.0.10")
-set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.7.4")
+set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.0")
 set(REPO_LIBJPEG_SRCDIR "jpeg-9d")
 set(REPO_LIBPNG_SRCDIR "libpng-1.6.37")
 set(REPO_LIBUNIBREAK_SRCDIR "libunibreak-4.3")

diff --git a/thirdparty_repo/repo_srcdirs.mk b/thirdparty_repo/repo_srcdirs.mk
@@ -4,7 +4,7 @@
 
 REPO_FREETYPE_SRCDIR := freetype-2.10.4
 REPO_FRIBIDI_SRCDIR := fribidi-1.0.10
-REPO_HARFBUZZ_SRCDIR := harfbuzz-2.7.4
+REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.0
 REPO_LIBJPEG_SRCDIR := jpeg-9d
 REPO_LIBPNG_SRCDIR := libpng-1.6.37
 REPO_LIBUNIBREAK_SRCDIR := libunibreak-4.3