diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-09-02 08:22:10 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-02 09:53:49 +0100 |
commit | 0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba (patch) | |
tree | 67ef90b98f281032c1e49d7adf0b11e5e9a7889f /meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb | |
parent | 36aa00b6f704761b6b518729befc936af674c68d (diff) | |
download | poky-0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba.tar.gz |
libmatchbox: Fix the matchbox environment start failure on x86-64 target.
x86 target works well. Root cause is libmatchbox use "0"(int) as termination
indicator when calling XftFontOpen, which in turn called FcPatternVapBuild(in
fontconfig). It try to get the "0" as char* and fetch wrong value, as int and
char* has different size on x86-64. This patch forces a NULL pointer as
terminator to fix it.
[BUGID #234] is fixed by this
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb')
-rw-r--r-- | meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb index 1d7d9c8f44..fb554b85f3 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb | |||
@@ -1,11 +1,12 @@ | |||
1 | require libmatchbox.inc | 1 | require libmatchbox.inc |
2 | 2 | ||
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ | 5 | SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ |
6 | file://16bppfixes.patch;patch=1 \ | 6 | file://16bppfixes.patch;patch=1 \ |
7 | file://configure_fixes.patch;patch=1 \ | 7 | file://configure_fixes.patch;patch=1 \ |
8 | file://check.m4" | 8 | file://check.m4 \ |
9 | file://matchbox-start-fix.patch;patch=1" | ||
9 | 10 | ||
10 | do_configure_prepend () { | 11 | do_configure_prepend () { |
11 | cp ${WORKDIR}/check.m4 ${S}/ | 12 | cp ${WORKDIR}/check.m4 ${S}/ |