diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-graphics/ttf-fonts | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/ttf-fonts')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb) | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb | 19 |
4 files changed, 24 insertions, 5 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb index bd552c08a..4df0c3afb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Hunky fonts - TTF Version" HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts" LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=7fbc338309ac38fefcd64b04bb903e34" +LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7" PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" @@ -16,5 +16,5 @@ FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif" FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf" FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf" -SRC_URI[md5sum] = "36444795a356fb8a56c63b2840729bab" -SRC_URI[sha256sum] = "e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829" +SRC_URI[md5sum] = "b933312967842e5737b5415fa22d682a" +SRC_URI[sha256sum] = "3fc528737ccd12ec3c09c4a91447d241d3c5bceeeb4d24b7f2c29b15c9735328" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 20041bb7b..bf32fedc3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" do_configure() { - mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf + cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb index f9679d606..0af0e91d6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" FONT_PACKAGES = "${PN}" FILES_${PN} = "${datadir}" -inherit pythonnative +inherit python3native do_compile() { cd ${S}; make ttf; diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb new file mode 100644 index 000000000..e74f7a7f6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -0,0 +1,19 @@ +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;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" |