summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-stroke
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-09-26 11:55:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 16:56:42 (GMT)
commitd39c6738df4b7e8ef22f2a7154274c1d08b1d51f (patch)
tree04515a719d958cedc30cfb8cf488b5049ca68d06 /meta/recipes-sato/matchbox-stroke
parent114ade8b143e697f09a0672093fe64205eac6209 (diff)
downloadpoky-d39c6738df4b7e8ef22f2a7154274c1d08b1d51f.tar.gz
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-stroke')
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch37
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb3
2 files changed, 1 insertions, 39 deletions
diff --git a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
deleted file mode 100644
index cbfa7de..0000000
--- a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke'^M
5| Making all in src^M
6| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke/src'^M
7| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-stroke matchbox-stroke.o matchbox-stroke-ui.o matchbox-stroke-recog.o matchbox-stroke-mode.o matchbox-stroke-action.o config-parser.o util-hash.o util.o -lXft -lX11 -lXtst -lfakekey -lexpat -lm^M
8| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: u: invalid DSO for symbol `XRenderFindVisualFormat' definition^M
9| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M
10| collect2: ld returned 1 exit status^M
11| make[2]: *** [matchbox-stroke] Error 1
12
13Nitin A Kamble <nitin.a.kamble@intel.com>
14Date: 2011/01/11
15
16Upstream-Status: Pending
17
18Index: matchbox-stroke/configure.ac
19===================================================================
20--- matchbox-stroke.orig/configure.ac
21+++ matchbox-stroke/configure.ac
22@@ -38,7 +38,7 @@ AC_ARG_WITH(expat-lib,
23 expat_lib=$withval, expat_lib=yes)
24
25
26-PKG_CHECK_MODULES(MBSTROKE, xft libfakekey,,
27+PKG_CHECK_MODULES(MBSTROKE, xft libfakekey xrender,,
28 AC_MSG_ERROR([*** Required Librarys not found ***]))
29
30 dnl ------ Expat ------------------------------------------------------------
31@@ -160,4 +160,4 @@ echo "
32 compiler: ${CC}
33
34 Building with Debug: ${enable_debug}
35-"
36\ No newline at end of file
37+"
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index 10388f4..44b316d 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -13,8 +13,7 @@ PR = "r0"
13 13
14SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 14SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
15 file://single-instance.patch \ 15 file://single-instance.patch \
16 file://configure_fix.patch;maxrev=1819 \ 16 file://configure_fix.patch;maxrev=1819"
17 file://dso_linking_change_build_fix.patch "
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
20 19