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_svn.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_svn.bb')
-rw-r--r-- | meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb index 3cdcd324f4..98c901f678 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb | |||
@@ -1,13 +1,14 @@ | |||
1 | require libmatchbox.inc | 1 | require libmatchbox.inc |
2 | 2 | ||
3 | PV = "1.7+svnr${SRCREV}" | 3 | PV = "1.7+svnr${SRCREV}" |
4 | PR = "r4" | 4 | PR = "r5" |
5 | DEFAULT_PREFERENCE = "-1" | 5 | DEFAULT_PREFERENCE = "-1" |
6 | 6 | ||
7 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ | 7 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ |
8 | file://configure_fixes.patch;patch=1 \ | 8 | file://configure_fixes.patch;patch=1 \ |
9 | file://check.m4 \ | 9 | file://check.m4 \ |
10 | file://16bppfixes.patch;patch=1" | 10 | file://16bppfixes.patch;patch=1 \ |
11 | file://matchbox-start-fix.patch;patch=1" | ||
11 | 12 | ||
12 | S = "${WORKDIR}/libmatchbox" | 13 | S = "${WORKDIR}/libmatchbox" |
13 | 14 | ||