[oe-commits] Ilya Petrov : add 18 bpp support to psplash

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: 98365735b1e1431cc94f1b9364194919ba8de652
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=98365735b1e1431cc94f1b9364194919ba8de652

Author: Ilya Petrov <ilya.muromec at gmail.com>
Date:   Sat Aug 15 23:54:18 2009 +0000

add 18 bpp support to psplash

2009/8/16 Holger Hans Peter Freyther <holger+oe at freyther.de>:
> yes, it is not that we don't know people working at intel...

sent.

---

 recipes/psplash/files/psplash-18bpp.patch |   44 +++++++++++++++++++++++++++++
 recipes/psplash/psplash-angstrom_svn.bb   |    1 +
 2 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/recipes/psplash/files/psplash-18bpp.patch b/recipes/psplash/files/psplash-18bpp.patch
new file mode 100644
index 0000000..5e582a4
--- /dev/null
+++ b/recipes/psplash/files/psplash-18bpp.patch
@@ -0,0 +1,44 @@
+upstream: http://bugzilla.o-hand.com/show_bug.cgi?id=1764
+
+diff -ru psplash/psplash-fb.c /home/muromec/psplash/psplash-fb.c
+--- psplash/psplash-fb.c       2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.c 2009-08-16 11:59:57.000000000 +0300
+@@ -72,6 +72,7 @@
+   fb->real_width  = fb->width  = fb_var.xres;
+   fb->real_height = fb->height = fb_var.yres;
+   fb->bpp    = fb_var.bits_per_pixel;
++  fb->depth  = fb_var.red.length + fb_var.green.length + fb_var.blue.length;
+   fb->stride = fb_fix.line_length;
+   fb->type   = fb_fix.type;
+   fb->visual = fb_fix.visual;
+@@ -176,7 +177,7 @@
+     }
+
+   /* FIXME: handle no RGB orderings */
+-  switch (fb->bpp)
++  switch (fb->depth)
+     {
+     case 24:
+     case 32:
+@@ -184,6 +185,10 @@
+       *(fb->data + off + 1) = green;
+       *(fb->data + off + 2) = blue;
+       break;
++    case 18:
++      *(fb->data + off)     = (red >> 2) | ((green & 0x0C) << 4);
++      *(fb->data + off + 1) = ((green & 0xF0) >> 4) | ((blue & 0x3C) << 2);
++      *(fb->data + off + 2) = (blue & 0xC0) >> 6;
+     case 16:
+       *(volatile uint16 *) (fb->data + off)
+       = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
+diff -ru psplash/psplash-fb.h /home/muromec/psplash/psplash-fb.h
+--- psplash/psplash-fb.h       2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.h 2009-08-16 11:58:39.000000000 +0300
+@@ -26,6 +26,7 @@
+   int            visual;
+   int            width, height;
+   int            bpp;
++  int            depth;
+   int            stride;
+   char                *data;
+   char                *base;
diff --git a/recipes/psplash/psplash-angstrom_svn.bb b/recipes/psplash/psplash-angstrom_svn.bb
index f65fb81..fc5e4c2 100644
--- a/recipes/psplash/psplash-angstrom_svn.bb
+++ b/recipes/psplash/psplash-angstrom_svn.bb
@@ -10,6 +10,7 @@ ALTERNATIVE_PRIORITY = "20"
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+          file://psplash-18bpp.patch;patch=1 \
           file://logo-math.patch;patch=1 \
           file://psplash-hand-img.h \
           file://psplash-bar-img.h \