On Sat, Mar 27, 2010 at 05:25:31PM +0100, Guido Günther wrote:
> Hi Daniel,
> On Sat, Mar 27, 2010 at 04:27:55PM +0100, Daniel Baumann wrote:
> > On 03/27/2010 03:42 PM, Guido Günther wrote:
> > >>thanks, applied. i'm wondering if you don't have a git tree online,
> > >>so i could merge directly. anyhow, thanks a lot.
> > >I can arrange for that.
> >
> > i'm fine applying patches by hand, however, it would be a bit
> > faster, and you wouldn't need to go through the overhead of writing
> > bugs all the time.
> >
> > >Hmm...I don't see much value in splitting these out. That's why I
> > >introducted the x11 package, we can keep the x11 stuff there: the
> > >renderer as well as the log reader.
> >
> > ack.
> >
> > fyi, have uploaded 0.7.2-6 to unstable (which will appear once
> > ftp-master is back), and 0.8.0 to experimental (which has to go
> > through NEW).
> Great. 0.8.0 needs some more work though. The attached patch adds the
> missing config files and also removes /usr/bin/* from plymouth so the
> log viewer doesn't end up in two packages. We still segfault with the
> x11 and drm backend though (the later looking for noveau symbols). I'll
> fix that up as soon as I find the time.
Attached patch fixes the undefined reference to the disabled noveau
renderer so we don't crash.
-- Guido
>From 6befbf76750f09568c23b789f2d61c74083f931c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <[email protected]>
Date: Sat, 27 Mar 2010 18:39:56 +0100
Subject: [PATCH] Don't use ply_renderer_nouveau_driver_get_interface
to avoid undefined reference
---
debian/patches/03-libdrm.patch | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/debian/patches/03-libdrm.patch b/debian/patches/03-libdrm.patch
index 26c77e8..aafd462 100644
--- a/debian/patches/03-libdrm.patch
+++ b/debian/patches/03-libdrm.patch
@@ -120,3 +120,21 @@ diff -Naurp plymouth.orig/src/plugins/renderers/drm/Makefile.in plymouth/src/plu
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/drm_la-ply-renderer-radeon-driver....@am__quote@
.c.o:
+diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
+index 0dcca2d..8b2bbc5 100644
+--- a/src/plugins/renderers/drm/plugin.c
++++ b/src/plugins/renderers/drm/plugin.c
+@@ -454,11 +454,13 @@ load_driver (ply_renderer_backend_t *backend)
+ backend->driver_interface = ply_renderer_radeon_driver_get_interface ();
+ backend->driver_supports_mapping_console = false;
+ }
++#if 0
+ else if (strcmp (driver_name, "nouveau") == 0)
+ {
+ backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
+ backend->driver_supports_mapping_console = false;
+ }
++#endif
+ free (driver_name);
+
+ if (backend->driver_interface == NULL)
--
1.7.0.3
