diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-09-26 19:55:47 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:49 +0000 |
commit | 64ba74deff7fdefcd4a493084a834d825eb1945d (patch) | |
tree | 715a299b63c40e21b2e0d423409a7327fe361860 /meta/recipes-graphics | |
parent | ff047d3a77f57400ec8e0b7debee34cf4375e5a0 (diff) | |
download | poky-64ba74deff7fdefcd4a493084a834d825eb1945d.tar.gz |
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa)
(From OE-Core rev: 1194935707f4acd9029b36769bc0320ba0a90163)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch index 284318c948..ac22b9995f 100644 --- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch +++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Accepted |
2 | 2 | ||
3 | Index: libmb/mbpixbuf.c | 3 | Index: libmb/mbpixbuf.c |
4 | =================================================================== | 4 | =================================================================== |
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch index 058342c442..88f5d7091b 100644 --- a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch +++ b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch | |||
@@ -6,7 +6,7 @@ on x86-64. This patch forces a NULL pointer as terminator to fix it. | |||
6 | 6 | ||
7 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | 7 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Accepted |
10 | 10 | ||
11 | Index: libmatchbox-1.9/libmb/mbexp.c | 11 | Index: libmatchbox-1.9/libmb/mbexp.c |
12 | =================================================================== | 12 | =================================================================== |
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb index d9d4535aa6..ac329e5193 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb | |||
@@ -1,15 +1,13 @@ | |||
1 | require libmatchbox.inc | 1 | require libmatchbox.inc |
2 | 2 | ||
3 | SRCREV = "c81f8f444b83b187727f046432b186d67a42c732" | 3 | SRCREV = "d9dd0ac810de4f0b93cd813ce14aee34c722c2cf" |
4 | PV = "1.9+git${SRCPV}" | 4 | PV = "1.9+git${SRCPV}" |
5 | PR = "r0" | 5 | PR = "r0" |
6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ | 8 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
9 | file://configure_fixes.patch \ | 9 | file://configure_fixes.patch \ |
10 | file://check.m4 \ | 10 | file://check.m4" |
11 | file://16bppfixes.patch \ | ||
12 | file://matchbox-start-fix.patch" | ||
13 | 11 | ||
14 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
15 | 13 | ||
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch index 8c40e85848..1f877d76fe 100644 --- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch +++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch | |||
@@ -1,4 +1,6 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Accepted |
2 | Instead matchbox-window-manager-2, it is in libmatchboxwm2, which has build | ||
3 | failure as partial gtk-doc implementation. | ||
2 | 4 | ||
3 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 | 5 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 |
4 | Fix following build error: | 6 | Fix following build error: |