From d39c6738df4b7e8ef22f2a7154274c1d08b1d51f Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Mon, 26 Sep 2011 19:55:47 +0800 Subject: matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream (From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- meta/recipes-graphics/libmatchbox/files/16bppfixes.patch | 2 +- meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch | 2 +- meta/recipes-graphics/libmatchbox/libmatchbox_git.bb | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'meta/recipes-graphics/libmatchbox') 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 @@ -Upstream-Status: Pending +Upstream-Status: Accepted Index: libmb/mbpixbuf.c =================================================================== 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. Signed-off-by: Zhai Edwin -Upstream-Status: Pending +Upstream-Status: Accepted Index: libmatchbox-1.9/libmb/mbexp.c =================================================================== 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 @@ require libmatchbox.inc -SRCREV = "c81f8f444b83b187727f046432b186d67a42c732" +SRCREV = "d9dd0ac810de4f0b93cd813ce14aee34c722c2cf" PV = "1.9+git${SRCPV}" PR = "r0" DEFAULT_PREFERENCE = "-1" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ file://configure_fixes.patch \ - file://check.m4 \ - file://16bppfixes.patch \ - file://matchbox-start-fix.patch" + file://check.m4" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf