Skip to contentSkip to conversation

psplash: unbreak recipe

PATCH Superseded Eric Benard 1 participant 1 message May 16, 2010

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 recipes/psplash/files/angstrom/psplash-poky-img.h  |   10 +-
 recipes/psplash/files/boc01/psplash-poky-img.h     |   10 +-
 recipes/psplash/files/configurability.patch        |   16 +-
 recipes/psplash/files/kaeilos/psplash-poky-img.h   |   10 +-
 recipes/psplash/files/openmoko/psplash-poky-img.h  |   10 +-
 recipes/psplash/files/psplash-poky-img.h           |   10 +-
 recipes/psplash/files/psplash_grayscale.patch      |   62 +-
 .../psplash-omap3pandora/configurability.patch     |   16 +-
 .../psplash/psplash-omap3pandora/logo-math.patch   |   26 +-
 .../psplash-omap3pandora/psplash-hand-img.h        |15422 --------------------
 .../psplash-omap3pandora/psplash-poky-img.h        |15422 ++++++++++++++++++++
 11 files changed, 15511 insertions(+), 15503 deletions(-)
 delete mode 100644 recipes/psplash/psplash-omap3pandora/psplash-hand-img.h
 create mode 100644 recipes/psplash/psplash-omap3pandora/psplash-poky-img.h
recipes/psplash/files/angstrom/psplash-poky-img.h +5 -5
index 263befa..3782872 100644
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (920)
-#define HAND_IMG_WIDTH (230)
-#define HAND_IMG_HEIGHT (231)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (920)
+#define POKY_IMG_WIDTH (230)
+#define POKY_IMG_HEIGHT (231)
+#define POKY_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\307\354\354\341\377\2\342\345\333\377\344\346\334\377\377\354\354\341" \
   "\377\221\354\354\341\377\3\242\256\246\377t\210\201\377\222\241\231\377" \
   "\315\354\354\341\377\4\325\333\322\377\264\304\275\377\245\271\263\377" \
recipes/psplash/files/boc01/psplash-poky-img.h +5 -5
index 8c23e48..7cb17fa 100644
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (384)
-#define HAND_IMG_WIDTH (128)
-#define HAND_IMG_HEIGHT (64)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (384)
+#define POKY_IMG_WIDTH (128)
+#define POKY_IMG_HEIGHT (64)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\267\377" \
   "\377\377\6\267\267\267~~~\227\227\227\265\265\265\331\331\331\371\371" \
   "\371\372\377\377\377\11\334\334\334\234\234\234tttUUUTTTZZZ\201\201\201" \
recipes/psplash/files/configurability.patch +8 -8
index c968865..90a9c34 100644
@@ -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, 
recipes/psplash/files/kaeilos/psplash-poky-img.h +5 -5
index d262d6c..73b1375 100644
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (720)
-#define HAND_IMG_WIDTH (240)
-#define HAND_IMG_HEIGHT (136)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (720)
+#define POKY_IMG_WIDTH (240)
+#define POKY_IMG_HEIGHT (136)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
recipes/psplash/files/openmoko/psplash-poky-img.h +5 -5
index 26f7f41..42cdb63 100644
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (1440)
-#define HAND_IMG_WIDTH (480)
-#define HAND_IMG_HEIGHT (640)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (1440)
+#define POKY_IMG_WIDTH (480)
+#define POKY_IMG_HEIGHT (640)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" \
   "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" \
recipes/psplash/files/psplash-poky-img.h +5 -5
index c54f04c..5278177 100644
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (880)
-#define HAND_IMG_WIDTH (220)
-#define HAND_IMG_HEIGHT (137)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (880)
+#define POKY_IMG_WIDTH (220)
+#define POKY_IMG_HEIGHT (137)
+#define POKY_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\310\354\354\341\377\2\342\342\330\377\352\352\337\377\323\354\354\341" \
   "\377\2\346\346\333\377\345\345\332\377\377\354\354\341\377\206\354\354" \
   "\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343" \
recipes/psplash/files/psplash_grayscale.patch +31 -31

85 lines not on this page · raw message

recipes/psplash/psplash-omap3pandora/configurability.patch +8 -8
index c968865..90a9c34 100644
@@ -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, 
recipes/psplash/psplash-omap3pandora/logo-math.patch +17 -9
index 21467af..2ebfd7c 100644
@@ -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
+
recipes/psplash/psplash-omap3pandora/psplash-hand-img.h deleted +0 -15422

2,762 lines not on this page · raw message

recipes/psplash/psplash-omap3pandora/psplash-poky-img.h new file +15422 -0

15,422 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.3.3

Part of the diff is not shown here. View the raw message.