summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Bragg <bob@openedhand.com>2008-05-27 16:53:08 +0000
committerRobert Bragg <bob@openedhand.com>2008-05-27 16:53:08 +0000
commitf83b1de69bf2902843cf70614da10088ecb333e8 (patch)
treed205c37c11de9e1a257897b8084f2151c38acc7d /meta
parentd723f4212e36d030e53ce5f8b6e7fbf0fd748455 (diff)
downloadpoky-f83b1de69bf2902843cf70614da10088ecb333e8.tar.gz
Bumps the psplash SRCREV and removes the fbdev pixel format patch that has now
been applied upstream. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4556 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/psplash/files/psplash-fbdev-pixfmt.patch127
-rw-r--r--meta/packages/psplash/psplash_svn.bb5
3 files changed, 3 insertions, 131 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a7bcc30663..0ec6b38654 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,7 +144,7 @@ SRCREV_pn-opkg-sdk ?= "4209"
144SRCREV_pn-opkg ?= "4209" 144SRCREV_pn-opkg ?= "4209"
145SRCREV_pn-oprofileui ?= "173" 145SRCREV_pn-oprofileui ?= "173"
146SRCREV_pn-owl-video-widget ?= "324" 146SRCREV_pn-owl-video-widget ?= "324"
147SRCREV_pn-psplash ?= "363" 147SRCREV_pn-psplash ?= "377"
148QEMUSRCREV = "4242" 148QEMUSRCREV = "4242"
149SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" 149SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
150SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" 150SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
diff --git a/meta/packages/psplash/files/psplash-fbdev-pixfmt.patch b/meta/packages/psplash/files/psplash-fbdev-pixfmt.patch
deleted file mode 100644
index 5b866cb119..0000000000
--- a/meta/packages/psplash/files/psplash-fbdev-pixfmt.patch
+++ /dev/null
@@ -1,127 +0,0 @@
1Index: psplash-fb.c
2===================================================================
3--- psplash-fb.c (revision 376)
4+++ psplash-fb.c (working copy)
5@@ -25,6 +25,77 @@
6 free(fb);
7 }
8
9+static int
10+attempt_to_change_pixel_format (PSplashFB *fb,
11+ struct fb_var_screeninfo *fb_var)
12+{
13+ /* By default the framebuffer driver may have set an oversized
14+ * yres_virtual to support VT scrolling via the panning interface.
15+ *
16+ * We don't try and maintain this since it's more likely that we
17+ * will fail to increase the bpp if the driver's pre allocated
18+ * framebuffer isn't large enough.
19+ */
20+ fb_var->yres_virtual = fb_var->yres;
21+
22+ /* First try setting an 8,8,8,0 pixel format so we don't have to do
23+ * any conversions while drawing. */
24+
25+ fb_var->bits_per_pixel = 32;
26+
27+ fb_var->red.offset = 0;
28+ fb_var->red.length = 8;
29+
30+ fb_var->green.offset = 8;
31+ fb_var->green.length = 8;
32+
33+ fb_var->blue.offset = 16;
34+ fb_var->blue.length = 8;
35+
36+ fb_var->transp.offset = 0;
37+ fb_var->transp.length = 0;
38+
39+ if (ioctl (fb->fd, FBIOPUT_VSCREENINFO, fb_var) == 0)
40+ {
41+ fprintf(stdout, "Switched to a 32 bpp 8,8,8 frame buffer\n");
42+ return 1;
43+ }
44+ else
45+ {
46+ fprintf(stderr,
47+ "Error, failed to switch to a 32 bpp 8,8,8 frame buffer\n");
48+ }
49+
50+ /* Otherwise try a 16bpp 5,6,5 format */
51+
52+ fb_var->bits_per_pixel = 16;
53+
54+ fb_var->red.offset = 11;
55+ fb_var->red.length = 5;
56+
57+ fb_var->green.offset = 5;
58+ fb_var->green.length = 6;
59+
60+ fb_var->blue.offset = 0;
61+ fb_var->blue.length = 5;
62+
63+ fb_var->transp.offset = 0;
64+ fb_var->transp.length = 0;
65+
66+ if (ioctl (fb->fd, FBIOPUT_VSCREENINFO, fb_var) == 0)
67+ {
68+ fprintf(stdout, "Switched to a 16 bpp 5,6,5 frame buffer\n");
69+ return 1;
70+ }
71+ else
72+ {
73+ fprintf(stderr,
74+ "Error, failed to switch to a 16 bpp 5,6,5 frame buffer\n");
75+ }
76+
77+ return 0;
78+}
79+
80 PSplashFB*
81 psplash_fb_new (int angle)
82 {
83@@ -55,20 +126,31 @@
84 goto fail;
85 }
86
87- if (ioctl (fb->fd, FBIOGET_FSCREENINFO, &fb_fix) == -1
88- || ioctl (fb->fd, FBIOGET_VSCREENINFO, &fb_var) == -1)
89+ if (ioctl (fb->fd, FBIOGET_VSCREENINFO, &fb_var) == -1)
90 {
91- perror ("Error getting framebuffer info");
92+ perror ("Error getting variable framebuffer info");
93 goto fail;
94 }
95
96 if (fb_var.bits_per_pixel < 16)
97 {
98 fprintf(stderr,
99- "Error, no support currently for %i bpp frame buffers\n",
100+ "Error, no support currently for %i bpp frame buffers\n"
101+ "Trying to change pixel format...\n",
102 fb_var.bits_per_pixel);
103+ if (!attempt_to_change_pixel_format (fb, &fb_var))
104+ goto fail;
105 }
106
107+ /* NB: It looks like the fbdev concept of fixed vs variable screen info is
108+ * broken. The line_length is part of the fixed info but it can be changed
109+ * if you set a new pixel format. */
110+ if (ioctl (fb->fd, FBIOGET_FSCREENINFO, &fb_fix) == -1)
111+ {
112+ perror ("Error getting fixed framebuffer info");
113+ goto fail;
114+ }
115+
116 fb->real_width = fb->width = fb_var.xres;
117 fb->real_height = fb->height = fb_var.yres;
118 fb->bpp = fb_var.bits_per_pixel;
119Index: psplash.c
120===================================================================
121--- psplash.c (revision 376)
122+++ psplash.c (working copy)
123@@ -286,3 +286,4 @@
124
125 return 0;
126 }
127+
diff --git a/meta/packages/psplash/psplash_svn.bb b/meta/packages/psplash/psplash_svn.bb
index 30626ea954..5aef1a9d2b 100644
--- a/meta/packages/psplash/psplash_svn.bb
+++ b/meta/packages/psplash/psplash_svn.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
2SECTION = "base" 2SECTION = "base"
3LICENSE = "GPL" 3LICENSE = "GPL"
4PV = "0.0+svnr${SRCREV}" 4PV = "0.0+svnr${SRCREV}"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ 7SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
8 file://psplash-init \ 8 file://psplash-init"
9 file://psplash-fbdev-pixfmt.patch;patch=1;pnum=0"
10 9
11S = "${WORKDIR}/psplash" 10S = "${WORKDIR}/psplash"
12 11