[SKIA] Build harfbuzz and include a skia.cmake file.

.github/workflows/skiabuild.yml

@@ -23,7 +23,7 @@ jobs:
           path: out/skia/wasm/sysroot.tar.gz
 
   build_windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code

recipes/skia/layers/harfbuzz.mk

@@ -0,0 +1,16 @@
+LAYER:=harfbuzz
+include $(DEFINE_LAYER)
+
+HARFBUZZ_GIT_REF?=4.2.1
+
+$(call git_clone, harfbuzz, https://github.com/harfbuzz/harfbuzz.git, $(HARFBUZZ_GIT_REF))
+
+$(call meson, harfbuzz)
+
+
+
+include $(BUILD_LAYER)
+
+$(L).clean:
+	rm -rf $(builddir)
+

recipes/skia/layers/skia.cmake.in

@@ -0,0 +1 @@
+

recipes/skia/layers/skia.mk

@@ -17,6 +17,8 @@ ifndef WINDOWS
 skia_pkgconfig:=$(SYSROOT)/$(PREFIX)/$(LIBDIR)/pkgconfig/skia.pc $(PKGROOT)/$(PREFIX)/$(LIBDIR)/pkgconfig/skia.pc
 endif
 
+skia_cmake:=$(PKGROOT)/skia.cmake
+
 $(call git_clone, skia, https://github.com/google/skia.git, $(SKIA_GIT_REF))
 
 $(L) += $(skia_sync_deps)
@@ -28,6 +30,7 @@ $(L) += $(skia_embedded_fonts)
 endif
 $(L) += $(skia_install)
 $(L) += $(skia_pkgconfig)
+$(L) += $(skia_cmake)
 
 
 DEPENDS += fontconfig
@@ -123,5 +126,14 @@ $(skia_pkgconfig): $(skia_install)
 
 endif
 
+$(skia_cmake): $(skia_install)
+	cp $(BASE_skia)/skia.cmake.in $@
+	echo "set(SKIA_PREFIX $(PREFIX))" > $@
+	echo "set(SKIA_LIBDIR $(PREFIX)/lib64)" >> $@
+	for def in $(shell cat $(skia_describe)) ; do \
+		echo "list(APPEND SKIA_COMPILE_DEFINES -D$${def})" >> $@ ; \
+	done
+
+
 $(L).clean:
 	rm -rf $(builddir)

recipes/skia/recipe.mk

@@ -45,12 +45,13 @@ BUILD_JOBS=-j$$(distcc -j)
 endif
 endif
 
-MESON_OPTIONS:=
+MESON_OPTIONS:=-Ddefault_library=both
 
 LAYERS-$(CONFIG_MESON) += meson
 LAYERS-$(CONFIG_FREETYPE) += freetype
 LAYERS-$(CONFIG_FONTCONFIG) += fontconfig
 
+LAYERS-y += harfbuzz
 LAYERS-y += skia
 
 LAYERS-$(CONFIG_AVALONIA_SKIA) += avalonia_skia