[meta-oe][PATCH v2] ttf-noto-emoji: upgrade 20200916 -> 2.051

[ecordonnier@snap.com]

From: Etienne Cordonnier <ecordonnier@snap.com>

- NotoEmoji-Regular.ttf was removed upstream in https://github.com/googlefonts/noto-emoji/commit/1442f6acc8463c428c8b38fc558e87c28d8efa5b
- A new COLRv1 format is provided, with a smaller file-size

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../packagegroups/packagegroup-meta-oe.bb     |  4 +++-
 .../ttf-fonts/ttf-noto-emoji_2.051.bb         | 23 +++++++++++++++++++
 .../ttf-fonts/ttf-noto-emoji_20200916.bb      | 18 ---------------
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_2.051.bb
 delete mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index a4b03e2a88..c3600d5c95 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -556,7 +556,9 @@ RDEPENDS:packagegroup-meta-oe-graphics = "\
     ttf-lklug \
     ttf-lohit \
     ttf-noto-emoji-color \
-    ttf-noto-emoji-regular \
+    ttf-noto-emoji-color-noflags \
+    ttf-noto-emoji-colrv1 \
+    ttf-noto-emoji-colrv1-noflags \
     ttf-pt-sans \
     ttf-roboto \
     ttf-sazanami-gothic \
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_2.051.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_2.051.bb
new file mode 100644
index 0000000000..6376b0e10d
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_2.051.bb
@@ -0,0 +1,23 @@
+require ttf.inc
+
+SUMMARY = "Google noto emoji font pack"
+HOMEPAGE = "https://github.com/googlefonts/noto-emoji"
+LICENSE = "OFL-1.1"
+LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097"
+
+SRC_URI = "git://github.com/googlefonts/noto-emoji;branch=main;protocol=https"
+SRCREV = "8998f5dd683424a73e2314a8c1f1e359c19e8742"
+PE = "1"
+
+PACKAGES =+ "${PN}-color ${PN}-color-noflags ${PN}-colrv1 ${PN}-colrv1-noflags"
+FONT_PACKAGES = "${PN} ${PN}-color ${PN}-color-noflags ${PN}-colrv1 ${PN}-colrv1-noflags"
+
+FILES:${PN} = "${datadir}/fonts/truetype/*.ttf"
+FILES:${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
+FILES:${PN}-color-noflags = "${datadir}/fonts/truetype/NotoColorEmoji-noflags.ttf"
+# The COLRv1 format is a color scalable font compared with the previous color bitmap fonts.
+# COLRv1 is significantly smaller than the color bitmap format (~5MB vs ~11MB).
+FILES:${PN}-colrv1 = "${datadir}/fonts/truetype/Noto-COLRv1.ttf"
+FILES:${PN}-colrv1-noflags = "${datadir}/fonts/truetype/Noto-COLRv1-noflags.ttf"
+
+do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
deleted file mode 100644
index b5dae22a9d..0000000000
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require ttf.inc
-
-SUMMARY = "Google noto emoji font pack"
-HOMEPAGE = "https://github.com/googlefonts/noto-emoji"
-LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097"
-
-SRC_URI = "git://github.com/googlefonts/noto-emoji;branch=main;protocol=https"
-SRCREV = "aac7ccaa4d1dea4543453b96f7d6fc47066a57ff"
-
-PACKAGES = "${PN}-color ${PN}-regular"
-FONT_PACKAGES = "${PN}-color ${PN}-regular"
-
-
-FILES:${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
-FILES:${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf"
-
-do_compile[noexec] = "1"
-- 
2.43.0