From d7bca38b11f537405341c890526adf4891f23df4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Dec 2012 21:54:29 +0000 Subject: libmatchbox: upgrade to 1.10, drop git All patches have been upstreamed so drop them, and as upstream isn't heavily developed drop the git recipe. (From OE-Core rev: 3465570601480d2e476e82b8b7254e94f87d2682) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libmatchbox/files/16bppfixes.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-graphics/libmatchbox/files/16bppfixes.patch (limited to 'meta/recipes-graphics/libmatchbox/files/16bppfixes.patch') diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch deleted file mode 100644 index ac22b9995f..0000000000 --- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Accepted - -Index: libmb/mbpixbuf.c -=================================================================== ---- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000 -+++ libmatchbox/libmb/mbpixbuf.c 2006-03-11 15:20:47.000000000 +0000 -@@ -716,7 +716,13 @@ - case 15: - return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); - case 16: -- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); -+ switch (pb->byte_order) -+ { -+ case BYTE_ORD_24_RGB: -+ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); -+ case BYTE_ORD_24_BGR: -+ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); -+ } - case 24: - case 32: - switch (pb->byte_order) -@@ -1880,12 +1886,11 @@ - for(y=0; yheight; y++) - for(x=0; xwidth; x++) - { -- /* Below is potentially dangerous. -- */ -- pixel = ( *p | (*(p+1) << 8)); -+ internal_16bpp_pixel_to_rgb(p, r, g, b); -+ internal_16bpp_pixel_next(p); -+ a = ((img->has_alpha) ? *p++ : 0xff); - -- p += ((img->has_alpha) ? 3 : 2); -- -+ pixel = mb_pixbuf_get_pixel(pb, r, g, b, a); - XPutPixel(img->ximg, x, y, pixel); - } - } -- cgit v1.2.3-54-g00ecf