linux/poky.git/meta/recipes-graphics/xorg-font, branch yocto-2.2.1

encodings: Add dependency to mkfontdir-native

2016-09-23T13:56:39+00:00

Currently adding a font recipe to an image doesn't have enough dependencies to cause mkfontdir-native to be included in the native sysroot. This creates problems with the postinstall scripts for fonts which call mkfontdir to create font index files: font.dir. The end result is missing font.dir files in the built image and a malfunctioning font system. Dependencies for the relevant recipes currently look like this: * [D ] -> font-util-native [R ] -> encodings, font-util [RN] -> font-util-native * font-util [D ] -> encodings [R ] -> mkfontdir, mkfontscale, encodings [RN] -> mkfontdir-native, mkfontscale-native * encodings [D ] -> mkfontscale-native, font-util-native * mkfontdir [R ] -> mkfontscale [RN] -> mkfontscale-native * mkfontscale [D ] -> libfontenc * libfontenc [D ] -> font-util Where: * D = DEPENDS * R = RDEPENDS * RN = RDEPENDS_class-native * e.g. font-adobe-100dpi*.bb Some details where omitted for clarity e.g. dependencies on util-macros. I believe the intent behind the RDEPENDS_class-native chain: * -> font-util-native -> mkfontdir-native was to provide the necessary dependency on mkfontdir. However because the native sysroot is not built from packages this RDEPENDS_class-native chain doesn't have the desire effect (i.e. it doesn't pull in mkfontdir-native). Changing the RDEPENDS_class-native chain into a DEPENDS_class-native chain is a non-starter because of the build time dependency loop it creates: * font-util-native -> mkfontscale-native -> libfontenc-native -> font-util-native Having upstream remove the build time dependency of libfontenc on font-util is also a non-starter[1] even though it does create problems in other distributions, for example on Debian see [2], [3]. Instead add a DEPENDS on mkfontdir-native in the encodings recipe in addition to the mkfontscale-native dependency it already contains. This solves the missing mkfontdir in the native sysroot problem without introducing a build dependency loop. [1] https://bugs.freedesktop.org/show_bug.cgi?id=97631 [2] https://wiki.debian.org/CircularBuildDependencies [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717843 (From OE-Core rev: aa8a7b2962f9a77bdd347843c41f86dc291b783e) Signed-off-by: Gratian Crisan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

font-util: Remove ${datadir}/fonts from SYSROOT_DIRS_BLACKLIST

2016-05-13T12:41:28+00:00

(From OE-Core rev: 237fa11ac4549f955a76dafccd8f047c2571b11c) Signed-off-by: Richard Purdie

font-util: upgrade to 1.3.1

2015-05-20T20:41:04+00:00

License checksums updated as the Unicode license was modified (wording only). (From OE-Core rev: 07878124fd65f10fec58767ea3062dfaab539425) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES

2015-05-14T10:43:58+00:00

They can't be built withou x11 in DISTRO_FEATURES. (From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

xorg-font-common: fix sysroot injection for encoding maps

2015-02-21T22:05:35+00:00

The xorg font builds use `pkg-config --variable=mapdir fontutil` to locate encoding maps. This variable ought to be sysroot-relative, but neither pkg-config nor font-util nor the fonts themselves provide any facility to add the sysroot back in. We're presently adding the sysroot by by twiddling MAPFILES_PATH in configure.ac. This is broken; it's actually defined in aclocal.m4, because the definition is provided by fontutil.m4. Another (more speculative) criticism is that it also hardcodes a build-specific absolute path into builds which might (incorrectly) encode it into target-installable packages. A somewhat more robust, focused, and clear solution is to override UTIL_DIR on the make command line. (UTIL_DIR, not MAPFILES_PATH, is what is actually referenced in the build.) (From OE-Core rev: 5cd320d8d21cd784b32f12a6944dc647a75abf94) Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

font-util: remove MAPFILES_PATH override

2015-02-21T22:05:35+00:00

MAPFILES_PATH is a configuration variable that is used by packages using font-util, which tells those packages how to compute it in fontutil.m4. Presently, we're manually twiddling things so that MAPFILES_PATH will consult the native sysroot, when building under *any* architecture. This complicates building other packages immensely, and also generates broken on-target packages, because the contents of font-util-dev will reference the native sysroot on the build machine (!). We don't even need to twiddle MAPFILES_PATH anymore so just delete it. This code also had a path bug (referencing /usr/lib/pkg-config instead of /usr/lib/pkgconfig) which is also fixed by deletion. (From OE-Core rev: 4199703db82d79408e0575e1332ad79375e14c39) Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

font-util: stage encoding maps into sysroot

2015-02-21T22:05:35+00:00

font-util installs encoding maps into /usr/share/fonts/X11. This path may not exist on the host (many distros install these into /usr/share/fonts/util) so they must exist in the sysroot in order for e.g. `pkg-config --variable=mapdir fontutil` to work correctly. However, currently /usr/share/fonts is explicitly not installed into sysroots, so the encoding maps were not getting found. Fix this by explicitly staging ${datadir}/fonts/ into the sysroot. (From OE-Core rev: a1598266c828ad0b73df971b22d6a2e3e1dd5cab) Signed-off-by: Ben Shelton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

xorg-minimal-fonts: set and handle S in a proper way

2015-01-23T11:36:27+00:00

After removal of auto-creating S we must ensure that all recipes are using a proper value for S. Also do some minor adjustment after changing value of S. [YOCTO #5627] (From OE-Core rev: dd7be09318b55a69cb8636e86d2af6e6b8140b31) Signed-off-by: Petter Mabäcker Signed-off-by: Richard Purdie

font-util: Fix incorrect PKG_CONFIG_PATH

2014-12-19T18:08:00+00:00

PKG_CONFIG_PATH always defaults to /usr/lib/pkgconfig, and the host /usr/lib/pkgconfig is always checked as a fallback; however, PKG_CONFIG_PATH is currently (incorrectly) set to /usr/lib/pkg-config in the sysroot, which doesn't exist. On host distros where the font encoding maps are stored under a different path than OE, this will break font builds, because ucs2any will attempt to read the sysroot's encoding maps with the host paths. (From OE-Core rev: 89a29a3ad0742cd713e739d3d460be7711966679) Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

xorg-font-common.inc: remove shell debug option

2014-06-10T16:24:17+00:00

'set -x' is added to package postinstall scripts. It causes trace information are printed when image first time boots such as core-image-sato. Remove it. (From OE-Core rev: 38ac187881266e6349084ee983046e311fb293e9) Signed-off-by: Kai Kang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie