ttf-noto-emoji: change recipe to match upstream version

Match recipe being upstreamed to allow easy removal of this
file on future upgrades

Ref: http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205154.html
Bug-AGL: SPEC-2701

Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Change-Id: Ieffb8aed6498867a19b03a5910f081df62dcb834

3 files changed, 20 insertions, 26 deletions

diff --git a/recipes-graphics/noto-emoji/noto-emoji_20190815.bb b/recipes-graphics/noto-emoji/noto-emoji_20190815.bb
deleted file mode 100644
index d3c39b595..000000000
--- a/recipes-graphics/noto-emoji/noto-emoji_20190815.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY     = "Google noto emoji font pack"
-HOMEPAGE    = "https://github.com/googlefonts/noto-emoji"
-SECTION     = "fonts"
-
-LICENSE     = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://${S}/fonts/LICENSE;md5=55719faa0112708e946b820b24b14097"
-
-SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https;branch=master"
-SRCREV = "833a43d03246a9325e748a2d783006454d76ff66"
-
-RDEPENDS_${PN} = "fontconfig"
-
-S = "${WORKDIR}/git"
-
-do_install() {
-    install -m 0755 -d ${D}/${datadir}/fonts/ttf
-    install -m 0644 -p ${S}/NotoColorEmoji.ttf ${D}/${datadir}/fonts/ttf
-}
-
-FILES_${PN} += "${datadir}/fonts/ttf/NotoColorEmoji.ttf"
-
-inherit allarch fontcache
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
diff --git a/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb
new file mode 100644
index 000000000..38aaa4ebb
--- /dev/null
+++ b/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb
@@ -0,0 +1,19 @@
+require ../../../external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/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;protocol=https"
+SRCREV = "833a43d03246a9325e748a2d783006454d76ff66"
+
+PACKAGES = "${PN}-color ${PN}-regular"
+FONT_PACKAGES = "${PN}-color ${PN}-regular"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
+FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf"
+
+do_compile[noexec] = "1"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 2bd16d79c..fb1bb4ef7 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -60,10 +60,10 @@ TTF_FONTS = " \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     ttf-dejavu-serif \
+    ttf-noto-emoji-color \
     source-han-sans-cn-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-tw-fonts \
-    noto-emoji \
     "