summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-09-02 08:22:10 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-02 09:53:49 +0100
commit0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba (patch)
tree67ef90b98f281032c1e49d7adf0b11e5e9a7889f /meta
parent36aa00b6f704761b6b518729befc936af674c68d (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch21
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb5
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb5
3 files changed, 27 insertions, 4 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
new file mode 100644
index 0000000000..04460a3114
--- /dev/null
+++ b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
@@ -0,0 +1,21 @@
1matchbox environment start fail on x86-64 target, while ok on x86 target. Root
2cause is libmatchbox use "0"(int) as termination indicator when calling
3XftFontOpen, which in turn called FcPatternVapBuild(in fontconfig). It try to
4get the "0" as char* and fetch wrong value, as int and char* has different size
5on x86-64. This patch forces a NULL pointer as terminator to fix it.
6
7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
8
9Index: libmatchbox-1.9/libmb/mbexp.c
10===================================================================
11--- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800
12+++ libmatchbox-1.9/libmb/mbexp.c 2010-08-28 06:30:05.000000000 +0800
13@@ -348,7 +348,7 @@
14 XFT_SIZE, XftTypeDouble , (double)font->pt_size,
15 XFT_WEIGHT, XftTypeInteger, weight,
16 XFT_SLANT, XftTypeInteger , slant,
17- 0);
18+ NULL);
19
20 if (font->font != NULL ) result = 2;
21
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 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3PR = "r7" 3PR = "r8"
4 4
5SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ 5SRC_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
10do_configure_prepend () { 11do_configure_prepend () {
11 cp ${WORKDIR}/check.m4 ${S}/ 12 cp ${WORKDIR}/check.m4 ${S}/
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 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3PV = "1.7+svnr${SRCREV}" 3PV = "1.7+svnr${SRCREV}"
4PR = "r4" 4PR = "r5"
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6 6
7SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 7SRC_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
12S = "${WORKDIR}/libmatchbox" 13S = "${WORKDIR}/libmatchbox"
13 14