rpms/plymouth/F-12 more-drm-fixes.patch, NONE, 1.1 plymouth.spec, 1.152, 1.153

[Ray Strode]

Author: rstrode

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

Modified Files:
	plymouth.spec 
Added Files:
	more-drm-fixes.patch 
Log Message:
- Fix the reason radeon single head users were affected.


more-drm-fixes.patch:
 libplybootsplash/ply-renderer.c |    3 ++-
 plugins/renderers/drm/plugin.c  |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE more-drm-fixes.patch ---
>From 3d53c471d7f8c477c46a1251100dd998e2609472 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 6 Oct 2009 15:30:33 -0400
Subject: [PATCH 1/2] [drm] don't close terminal

It belongs to the core daemon, not the plugin.
---
 src/plugins/renderers/drm/plugin.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 34aa8f8..d317e2a 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -487,7 +487,6 @@ open_device (ply_renderer_backend_t *backend)
 static void
 close_device (ply_renderer_backend_t *backend)
 {
-  ply_terminal_close (backend->terminal);
   free_heads (backend);
 
   ply_console_stop_watching_for_active_vt_change (backend->console,
-- 
1.6.5.rc2


>From 4c777de9fc17cb4b8ab454b26e2ece646c4829c9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 6 Oct 2009 15:31:53 -0400
Subject: [PATCH 2/2] [renderer] close device on failures

Before we were just unloading the module without
closing it.
---
 src/libplybootsplash/ply-renderer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 08a246b..f7f3c90 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -247,6 +247,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not query rendering device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
@@ -255,6 +256,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not map renderer to device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- plymouth.spec	7 Oct 2009 21:30:46 -0000	1.152
+++ plymouth.spec	7 Oct 2009 21:43:11 -0000	1.153
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.5%{?dist}
+Release: 0.2009.29.09.6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -33,6 +33,7 @@ Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
 Patch2: fix-firstboot-on-intel.patch
 Patch3: fix-firstboot-on-radeon.patch
+Patch4: more-drm-fixes.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -244,6 +245,7 @@ plugin.
 %patch1 -p1 -b .fix-text-password-crash
 %patch2 -p1 -b .fix-firstboot-on-intel
 %patch3 -p1 -b .fix-firstboot-on-radeon
+%patch4 -p1 -b .more-drm-fixes
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -461,6 +463,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.6
+- Fix the reason radeon single head users were affected.
+
 * Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.5
 - Prevent firstboot's X from crashing on radeon hardware. This should
   only affect multihead users, but for some reason it's getting some