From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: SPEC-3723: restructure meta-agl-demo All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- recipes-graphics/ttf-fonts/ttf-dejavu_%.bbappend | 13 +------------ recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc (limited to 'recipes-graphics/ttf-fonts') diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu_%.bbappend b/recipes-graphics/ttf-fonts/ttf-dejavu_%.bbappend index 15986586..86a5d90c 100644 --- a/recipes-graphics/ttf-fonts/ttf-dejavu_%.bbappend +++ b/recipes-graphics/ttf-fonts/ttf-dejavu_%.bbappend @@ -1,12 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -DEPENDS += "fontforge-native" - -# From the orginal work located at https://aur.archlinux.org/packages/ttf-dejavu-emojiless/ - -SRC_URI_append = " file://cleaner.py" - -do_install_prepend() { - for TTF in ${S}/*.ttf; do - fontforge -script ${WORKDIR}/cleaner.py ${TTF} - done -} +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'ttf-dejavu_agldemo.inc', '', d)} diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc new file mode 100644 index 00000000..bb47bdc7 --- /dev/null +++ b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +DEPENDS_append = " fontforge-native" + +# From the orginal work located at https://aur.archlinux.org/packages/ttf-dejavu-emojiless/ + +SRC_URI_append = " file://cleaner.py" + +do_install_prepend() { + for TTF in ${S}/*.ttf; do + fontforge -script ${WORKDIR}/cleaner.py ${TTF} + done +} -- cgit 1.2.3-korg