Bug#380752: usplash: Make it possible to use the default font in external themes

[Petter Reinholdtsen <pere@hungry.com>]

Package: usplash
Version: 0.3a
Tags: patch

At the moment, usplash themes need to include their own font in the
.so file.  It would be useful to have a way to use the default font.
This patch make it possible, by setting the 'font' struct member to
NULL.  It is tested and found to be working.


--- usplash.c.orig   2006-08-01 08:14:02.000000000 +0200
+++ usplash.c 2006-08-01 12:14:29.000000000 +0200
@@ -63,6 +63,9 @@
 /* Default theme, used when no suitable alternative can be found */
 extern struct usplash_theme testcard_theme;

+/* Font structure built-in to bogl */
+extern struct bogl_font font_helvB10;
+
 /* Theme being used */
 static struct usplash_theme *theme;

@@ -129,6 +132,9 @@
                if ((theme == NULL) || (theme->version != THEME_VERSION)) {
                        dlclose (theme_handle);
                        theme = &testcard_theme;
+
+                       if (NULL == theme->font)
+                               theme->font = &font_helvB10;
                }
        } else {
                theme = &testcard_theme;

Please include the patch in a future version of usplash.