rpms/plymouth/F-12 fix-details-clear-screen.patch, 1.1, 1.2 plymouth.spec, 1.156, 1.157

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30373

Modified Files:
	fix-details-clear-screen.patch plymouth.spec 
Log Message:
- Fix frame-buffer fallback plugin
  (broken by details fix in 0.8.0-0.2009.29.09.7)


fix-details-clear-screen.patch:
 b/src/libplybootsplash/ply-renderer.c         |   13 +++++++++++--
 b/src/plugins/renderers/frame-buffer/plugin.c |    9 ++++-----
 src/libplybootsplash/ply-renderer.c           |   12 +++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

Index: fix-details-clear-screen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-details-clear-screen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-details-clear-screen.patch	8 Oct 2009 21:49:59 -0000	1.1
+++ fix-details-clear-screen.patch	9 Oct 2009 21:41:46 -0000	1.2
@@ -92,3 +92,57 @@ index 7c6695f..591af2c 100644
 -- 
 1.6.5.rc2
 
+From 5d631743d6b4ef0ab861d9dd83719390af7fdab0 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 9 Oct 2009 17:38:17 -0400
+Subject: [PATCH] [frame-buffer] initialize head on query not map
+
+That's the "right" thing to do and now that we
+map lazily, doing it the old way is broken.
+---
+ src/plugins/renderers/frame-buffer/plugin.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
+index 0163daa..ce42eb3 100644
+--- a/src/plugins/renderers/frame-buffer/plugin.c
++++ b/src/plugins/renderers/frame-buffer/plugin.c
+@@ -338,6 +338,8 @@ close_device (ply_renderer_backend_t *backend)
+                                                   (ply_console_active_vt_changed_handler_t)
+                                                   on_active_vt_changed,
+                                                   backend);
++  uninitialize_head (backend, &backend->head);
++
+   close (backend->device_fd);
+   backend->device_fd = -1;
+ 
+@@ -468,6 +470,8 @@ query_device (ply_renderer_backend_t *backend)
+   else
+     backend->flush_area = flush_area_to_any_device;
+ 
++  initialize_head (backend, &backend->head);
++
+   return true;
+ 
+ }
+@@ -489,8 +493,6 @@ map_to_device (ply_renderer_backend_t *backend)
+   if (head->map_address == MAP_FAILED)
+     return false;
+ 
+-  initialize_head (backend, head);
+-
+   ply_console_set_active_vt (backend->console,
+                              ply_terminal_get_vt_number (backend->terminal));
+ 
+@@ -504,8 +506,6 @@ unmap_from_device (ply_renderer_backend_t *backend)
+ 
+   head = &backend->head;
+ 
+-  uninitialize_head (backend, head);
+-
+   if (head->map_address != MAP_FAILED)
+     {
+       munmap (head->map_address, head->size);
+-- 
+1.6.5.rc2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- plymouth.spec	9 Oct 2009 14:02:17 -0000	1.156
+++ plymouth.spec	9 Oct 2009 21:41:46 -0000	1.157
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.8%{?dist}
+Release: 0.2009.29.09.9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -470,6 +470,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.9
+- Fix frame-buffer fallback plugin
+  (broken by details fix in 0.8.0-0.2009.29.09.7)
+
 * Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.8
 - Fix crash in text plugin on shutdown