Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/2.x] Update harfbuzz to 7.3.0 #2577

Merged
merged 13 commits into from
Aug 29, 2023
Merged

[release/2.x] Update harfbuzz to 7.3.0 #2577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27dc674
Update harfbuzz to 7.3.0
mattleibow Jun 11, 2023
d0103c9
Update the versions.txt
mattleibow Aug 22, 2023
7bae676
Update the projects
mattleibow Aug 22, 2023
4ccbf99
Merge branch 'release/2.x' into dev/update-harfbuzz
mattleibow Aug 22, 2023
d3841c6
Fix tvOS projects
mattleibow Aug 22, 2023
ca12282
Fix the build.gn
mattleibow Aug 22, 2023
8ab93c2
fix tizen
mattleibow Aug 22, 2023
3fb6f80
Fix Android
mattleibow Aug 23, 2023
f890265
fix watchos
mattleibow Aug 23, 2023
687c7cc
Update harfbuzz to 7.3.0 (#2582)
mattleibow Aug 29, 2023
c368418
Merge branch 'release/2.x' into dev/update-harfbuzz
mattleibow Aug 29, 2023
7dfaae5
Merge remote-tracking branch 'origin/release/2.x' into dev/update-har…
mattleibow Aug 29, 2023
68cbbf1
externals
mattleibow Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# dependencies
mdoc release 5.8.9
harfbuzz release 2.8.2
harfbuzz release 7.3.0
skia release m88
xunit release 2.4.2
xunit.runner.console release 2.4.2
Expand Down Expand Up @@ -40,16 +40,18 @@ libSkiaSharp milestone 88
libSkiaSharp increment 1

# native sonames
# <milestone>.<increment>.0
libSkiaSharp soname 88.1.0
HarfBuzz soname 0.20802.0
# 0.<60000 + major*100 + minor*10 + micro>.0
HarfBuzz soname 0.60730.0

# SkiaSharp.dll
SkiaSharp assembly 2.88.0.0
SkiaSharp file 2.88.6.0

# HarfBuzzSharp.dll
HarfBuzzSharp assembly 1.0.0.0
HarfBuzzSharp file 2.8.2.6
HarfBuzzSharp file 7.3.0.0

# nuget versions
SkiaSharp nuget 2.88.6
Expand Down Expand Up @@ -85,18 +87,18 @@ SkiaSharp.Views.Blazor nuget 2.88.6
SkiaSharp.HarfBuzz nuget 2.88.6
SkiaSharp.Skottie nuget 2.88.6
SkiaSharp.Vulkan.SharpVk nuget 2.88.6
HarfBuzzSharp nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.6
HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.6
HarfBuzzSharp nuget 7.3.0
HarfBuzzSharp.NativeAssets.Android nuget 7.3.0
HarfBuzzSharp.NativeAssets.iOS nuget 7.3.0
HarfBuzzSharp.NativeAssets.Linux nuget 7.3.0
HarfBuzzSharp.NativeAssets.MacCatalyst nuget 7.3.0
HarfBuzzSharp.NativeAssets.macOS nuget 7.3.0
HarfBuzzSharp.NativeAssets.Tizen nuget 7.3.0
HarfBuzzSharp.NativeAssets.tvOS nuget 7.3.0
HarfBuzzSharp.NativeAssets.UWP nuget 7.3.0
HarfBuzzSharp.NativeAssets.watchOS nuget 7.3.0
HarfBuzzSharp.NativeAssets.WebAssembly nuget 7.3.0
HarfBuzzSharp.NativeAssets.Win32 nuget 7.3.0

# nuget replacement versions
Xamarin.Forms nuget 4.8.0.1821
Expand Down
2 changes: 1 addition & 1 deletion externals/skia
Open in desktop
Submodule skia updated 6 files
+12 −67 BUILD.gn
+1 −1 DEPS
+224 −49 third_party/harfbuzz/BUILD.gn
+29 −0 third_party/harfbuzz/LICENSE
+11 −0 third_party/harfbuzz/config-override.h
+99 −0 third_party/harfbuzz/roll-harfbuzz.sh
167 changes: 0 additions & 167 deletions native/android/libHarfBuzzSharp/config.h
View file
Open in desktop

This file was deleted.

63 changes: 6 additions & 57 deletions native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,22 @@ include $(CLEAR_VARS)

cmd-strip = $(PRIVATE_STRIP) --strip-all $(call host-path,$1)

src_root = ../../../../externals/skia/third_party/externals/harfbuzz/src
src_root = $(abspath ../../../externals/skia/third_party/externals/harfbuzz/src)
ext_root = $(abspath ../../../externals/skia/third_party/harfbuzz)

LOCAL_MODULE := HarfBuzzSharp

LOCAL_C_INCLUDES := . $(src_root)
LOCAL_C_INCLUDES := . $(src_root) $(ext_root)

LOCAL_LDFLAGS := -s -Wl,--gc-sections

LOCAL_CFLAGS := -DHAVE_CONFIG_H -DNDEBUG \
LOCAL_CFLAGS := -DNDEBUG \
-DHAVE_CONFIG_OVERRIDE_H -DHAVE_OT -DHB_NO_FALLBACK_SHAPE \
-fno-rtti -fno-exceptions -fno-threadsafe-statics -fPIC \
-g -Os -ffunction-sections -fdata-sections

LOCAL_CPPFLAGS := -std=c++11

LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc \
$(src_root)/hb-aat-map.cc \
$(src_root)/hb-blob.cc \
$(src_root)/hb-buffer-serialize.cc \
$(src_root)/hb-buffer.cc \
$(src_root)/hb-common.cc \
$(src_root)/hb-draw.cc \
$(src_root)/hb-face.cc \
$(src_root)/hb-fallback-shape.cc \
$(src_root)/hb-font.cc \
$(src_root)/hb-map.cc \
$(src_root)/hb-number.cc \
$(src_root)/hb-ot-cff1-table.cc \
$(src_root)/hb-ot-cff2-table.cc \
$(src_root)/hb-ot-color.cc \
$(src_root)/hb-ot-face.cc \
$(src_root)/hb-ot-font.cc \
$(src_root)/hb-ot-layout.cc \
$(src_root)/hb-ot-map.cc \
$(src_root)/hb-ot-math.cc \
$(src_root)/hb-ot-meta.cc \
$(src_root)/hb-ot-metrics.cc \
$(src_root)/hb-ot-name.cc \
$(src_root)/hb-ot-shape-complex-arabic.cc \
$(src_root)/hb-ot-shape-complex-default.cc \
$(src_root)/hb-ot-shape-complex-hangul.cc \
$(src_root)/hb-ot-shape-complex-hebrew.cc \
$(src_root)/hb-ot-shape-complex-indic-table.cc \
$(src_root)/hb-ot-shape-complex-indic.cc \
$(src_root)/hb-ot-shape-complex-khmer.cc \
$(src_root)/hb-ot-shape-complex-myanmar.cc \
$(src_root)/hb-ot-shape-complex-syllabic.cc \
$(src_root)/hb-ot-shape-complex-thai.cc \
$(src_root)/hb-ot-shape-complex-use.cc \
$(src_root)/hb-ot-shape-complex-vowel-constraints.cc \
$(src_root)/hb-ot-shape-fallback.cc \
$(src_root)/hb-ot-shape-normalize.cc \
$(src_root)/hb-ot-shape.cc \
$(src_root)/hb-ot-tag.cc \
$(src_root)/hb-ot-var.cc \
$(src_root)/hb-set.cc \
$(src_root)/hb-shape-plan.cc \
$(src_root)/hb-shape.cc \
$(src_root)/hb-shaper.cc \
$(src_root)/hb-static.cc \
$(src_root)/hb-style.cc \
$(src_root)/hb-subset-cff-common.cc \
$(src_root)/hb-subset-cff1.cc \
$(src_root)/hb-subset-cff2.cc \
$(src_root)/hb-subset-input.cc \
$(src_root)/hb-subset-plan.cc \
$(src_root)/hb-subset.cc \
$(src_root)/hb-ucd.cc \
$(src_root)/hb-unicode.cc
LOCAL_SRC_FILES := $(src_root)/harfbuzz-subset.cc

include $(BUILD_SHARED_LIBRARY)
Loading