diff options
| author |   Eric Benard <eric@eukrea.com> | 2010-05-16 17:22:32 +0200 |
|---|---|---|
| committer | Eric Benard <eric@eukrea.com> | 2010-05-16 18:31:22 +0200 |
| commit | 2abd81d7a86c1c4db22851c0c01ff324b87b3ca0 (patch) | |
| tree | 45757f9cba753523289e6b31baa8a5796290aafc /recipes/psplash/psplash-omap3pandora | |
| parent | 08983f34211d0293973e52c4cc1793a66ddd1d8c (diff) | |
| download | openembedded-2abd81d7a86c1c4db22851c0c01ff324b87b3ca0.tar.gz | |
psplash: unbreak recipe
psplash was broken by my previous patch for several machines / distro
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=31402cd6f9d1e7887926bfde465bb25b07f6dbea
this patch should fix this and is compile tested for kaeilos and angstrom distro
and for boc01 and omap3pandora machines
Signed-off-by: Eric Benard <eric@eukrea.com>
Diffstat (limited to 'recipes/psplash/psplash-omap3pandora')
| -rw-r--r-- | recipes/psplash/psplash-omap3pandora/configurability.patch | 16 | ||||
| -rw-r--r-- | recipes/psplash/psplash-omap3pandora/logo-math.patch | 26 | ||||
| -rw-r--r-- | recipes/psplash/psplash-omap3pandora/psplash-poky-img.h (renamed from recipes/psplash/psplash-omap3pandora/psplash-hand-img.h) | 10 |
3 files changed, 30 insertions, 22 deletions
diff --git a/recipes/psplash/psplash-omap3pandora/configurability.patch b/recipes/psplash/psplash-omap3pandora/configurability.patch index c9688655c9..90a9c34719 100644 --- a/recipes/psplash/psplash-omap3pandora/configurability.patch +++ b/recipes/psplash/psplash-omap3pandora/configurability.patch @@ -232,15 +232,15 @@ Index: psplash/psplash.c /* Draw the OH logo */ - psplash_fb_draw_image (fb, -- (fb->width - HAND_IMG_WIDTH)/2, -- ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, +- (fb->width - POKY_IMG_WIDTH)/2, +- ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, + psplash_fb_draw_image (fb, -+ (fb->width - HAND_IMG_WIDTH)/2, -+ (fb->height - HAND_IMG_HEIGHT)/2, - HAND_IMG_WIDTH, - HAND_IMG_HEIGHT, - HAND_IMG_BYTES_PER_PIXEL, - HAND_IMG_RLE_PIXEL_DATA); ++ (fb->width - POKY_IMG_WIDTH)/2, ++ (fb->height - POKY_IMG_HEIGHT)/2, + POKY_IMG_WIDTH, + POKY_IMG_HEIGHT, + POKY_IMG_BYTES_PER_PIXEL, + POKY_IMG_RLE_PIXEL_DATA); /* Draw progress bar border */ - psplash_fb_draw_image (fb, diff --git a/recipes/psplash/psplash-omap3pandora/logo-math.patch b/recipes/psplash/psplash-omap3pandora/logo-math.patch index 21467af0ec..2ebfd7cd4c 100644 --- a/recipes/psplash/psplash-omap3pandora/logo-math.patch +++ b/recipes/psplash/psplash-omap3pandora/logo-math.patch @@ -1,15 +1,23 @@ upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801 comment: Do better math when showing logo vs progressbar. +--- + psplash.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) ---- psplash/psplash.c.org 2007-09-22 20:33:36.000000000 +0300 -+++ psplash/psplash.c 2007-12-01 21:27:08.000000000 +0200 -@@ -258,7 +258,7 @@ +diff --git a/psplash.c b/psplash.c +index 54a65cf..7a52e05 100644 +--- a/psplash.c ++++ b/psplash.c +@@ -269,7 +269,7 @@ main (int argc, char** argv) /* Draw the OH logo */ psplash_fb_draw_image (fb, - (fb->width - HAND_IMG_WIDTH)/2, -- (fb->height - HAND_IMG_HEIGHT)/2, -+ ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, - HAND_IMG_WIDTH, - HAND_IMG_HEIGHT, - HAND_IMG_BYTES_PER_PIXEL, + (fb->width - POKY_IMG_WIDTH)/2, +- (fb->height - POKY_IMG_HEIGHT)/2, ++ ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, + POKY_IMG_WIDTH, + POKY_IMG_HEIGHT, + POKY_IMG_BYTES_PER_PIXEL, +-- +1.6.3.3 + diff --git a/recipes/psplash/psplash-omap3pandora/psplash-hand-img.h b/recipes/psplash/psplash-omap3pandora/psplash-poky-img.h index 13c64cfc8b..c07ae8621d 100644 --- a/recipes/psplash/psplash-omap3pandora/psplash-hand-img.h +++ b/recipes/psplash/psplash-omap3pandora/psplash-poky-img.h @@ -1,10 +1,10 @@ /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */ -#define HAND_IMG_ROWSTRIDE (2400) -#define HAND_IMG_WIDTH (800) -#define HAND_IMG_HEIGHT (480) -#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */ -#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \ +#define POKY_IMG_ROWSTRIDE (2400) +#define POKY_IMG_WIDTH (800) +#define POKY_IMG_HEIGHT (480) +#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */ +#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \ "\347\0\0\0\202\0\0\1\1\0\0\0\202\0\0\1\202\0\0\2\1\0\0\1\202\0\0\2\202" \ "\0\0\3\1\0\0\2\202\0\0\3\202\0\0\4\1\0\0\3\202\0\0\4\202\0\0\5\1\0\0" \ "\4\202\0\0\5\202\0\0\6\1\0\0\5\202\0\0\6\202\0\0\7\1\0\0\6\202\0\0\7" \ |