Package: grub-pc
Version: 1.99~rc1-1
Severity: normal
Tags: upstream patch

Dear GRUB maintainers,

when I try to use background images with upper case file extensions
(e.g. `foo.JPEG') it doesn't work. If I try to debug this manually from
the grub shell, I get this:

        grub> background_image /grub/comet.JPEG
        error: unsupported bitmap format
        grub>

This is unfortunate since most digital cameras produce images with upper
case file extensions. FAT filesystems and Windows in general might be
other sources of files with upper case file extensions.

I can confirm that the attached patch fixes the problem for me. If you
have no objections, please include it in the next upload and submit it
upstream.

Best regards

Alexander Kurtz
diff -Naur grub2-1.99~rc1.orig/debian/changelog grub2-1.99~rc1/debian/changelog
--- grub2-1.99~rc1.orig/debian/changelog	2011-01-25 19:53:30.000000000 +0100
+++ grub2-1.99~rc1/debian/changelog	2011-01-25 20:01:02.190878027 +0100
@@ -1,3 +1,10 @@
+grub2 (1.99~rc1-1.1) experimental; urgency=low
+
+  * Non-maintainer upload
+  * Enable upper case file extensions for background images.
+  
+ -- Alexander Kurtz <kurtz.a...@googlemail.com>  Tue, 25 Jan 2011 20:00:54 +0100
+
 grub2 (1.99~rc1-1) experimental; urgency=low
 
   [ Colin Watson ]
diff -Naur grub2-1.99~rc1.orig/grub-core/video/readers/jpeg.c grub2-1.99~rc1/grub-core/video/readers/jpeg.c
--- grub2-1.99~rc1.orig/grub-core/video/readers/jpeg.c	2010-12-01 15:45:43.000000000 +0100
+++ grub2-1.99~rc1/grub-core/video/readers/jpeg.c	2011-01-25 19:56:20.218878962 +0100
@@ -736,16 +736,30 @@
   .next = 0
 };
 
+static struct grub_video_bitmap_reader JPG_reader = {
+  .extension = ".JPG",
+  .reader = grub_video_reader_jpeg,
+  .next = 0
+};
+
 static struct grub_video_bitmap_reader jpeg_reader = {
   .extension = ".jpeg",
   .reader = grub_video_reader_jpeg,
   .next = 0
 };
 
+static struct grub_video_bitmap_reader JPEG_reader = {
+  .extension = ".JPEG",
+  .reader = grub_video_reader_jpeg,
+  .next = 0
+};
+
 GRUB_MOD_INIT (jpeg)
 {
   grub_video_bitmap_reader_register (&jpg_reader);
+  grub_video_bitmap_reader_register (&JPG_reader);
   grub_video_bitmap_reader_register (&jpeg_reader);
+  grub_video_bitmap_reader_register (&JPEG_reader);
 #if defined(JPEG_DEBUG)
   cmd = grub_register_command ("jpegtest", grub_cmd_jpegtest,
 			       "FILE", "Tests loading of JPEG bitmap.");
diff -Naur grub2-1.99~rc1.orig/grub-core/video/readers/png.c grub2-1.99~rc1/grub-core/video/readers/png.c
--- grub2-1.99~rc1.orig/grub-core/video/readers/png.c	2010-12-01 15:45:43.000000000 +0100
+++ grub2-1.99~rc1/grub-core/video/readers/png.c	2011-01-25 19:57:21.614890391 +0100
@@ -894,9 +894,16 @@
   .next = 0
 };
 
+static struct grub_video_bitmap_reader PNG_reader = {
+  .extension = ".PNG",
+  .reader = grub_video_reader_png,
+  .next = 0
+};
+
 GRUB_MOD_INIT (png)
 {
   grub_video_bitmap_reader_register (&png_reader);
+  grub_video_bitmap_reader_register (&PNG_reader);
 #if defined(PNG_DEBUG)
   cmd = grub_register_command ("pngtest", grub_cmd_pngtest,
 			       "FILE",
diff -Naur grub2-1.99~rc1.orig/grub-core/video/readers/tga.c grub2-1.99~rc1/grub-core/video/readers/tga.c
--- grub2-1.99~rc1.orig/grub-core/video/readers/tga.c	2010-12-01 15:45:43.000000000 +0100
+++ grub2-1.99~rc1/grub-core/video/readers/tga.c	2011-01-25 19:57:52.003880794 +0100
@@ -477,9 +477,16 @@
   .next = 0
 };
 
+static struct grub_video_bitmap_reader TGA_reader = {
+  .extension = ".TGA",
+  .reader = grub_video_reader_tga,
+  .next = 0
+};
+
 GRUB_MOD_INIT(tga)
 {
   grub_video_bitmap_reader_register (&tga_reader);
+  grub_video_bitmap_reader_register (&TGA_reader);
 #if defined(TGA_DEBUG)
   cmd = grub_register_command ("tgatest", grub_cmd_tgatest,
                                "FILE", "Tests loading of TGA bitmap.");

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to