[Glibc-bsd-commits] r5324 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-15 11:57:50 +0000 (Wed, 15 Jan 2014)
New Revision: 5324

Added:
   trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff
Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
Log:
Additional build fixes for vt_xboxfb.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-01-09 23:55:58 UTC (rev 5323)
+++ trunk/kfreebsd-11/debian/changelog	2014-01-15 11:57:50 UTC (rev 5324)
@@ -1,3 +1,9 @@
+kfreebsd-11 (11.0~svn260450-2) UNRELEASED; urgency=low
+
+  * Additional build fixes for vt_xboxfb.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Jan 2014 12:57:28 +0100
+
 kfreebsd-11 (11.0~svn260450-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2014-01-09 23:55:58 UTC (rev 5323)
+++ trunk/kfreebsd-11/debian/patches/series	2014-01-15 11:57:50 UTC (rev 5324)
@@ -1,6 +1,7 @@
 # Patches from (or merged in) upstream
 
 # Patches that are in good shape for merging upstream
+xboxfb_ftbfs.diff
 mount_remount.diff
 ldscript_output_format.diff
 unescaped_kern_ident.diff

Added: trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff	                        (rev 0)
+++ trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff	2014-01-15 11:57:50 UTC (rev 5324)
@@ -0,0 +1,19 @@
+--- a/sys/dev/vt/hw/xboxfb/xboxfb.c
++++ b/sys/dev/vt/hw/xboxfb/xboxfb.c
+@@ -110,6 +110,7 @@
+     int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
+     unsigned int height, term_color_t fg, term_color_t bg)
+ {
++	struct fb_info *info;
+ 	struct xbox_softc *sc = vd->vd_softc;
+ 	u_long line;
+ 	uint32_t fgc, bgc;
+@@ -119,6 +120,8 @@
+ 	fgc = colormap[fg];
+ 	bgc = colormap[bg];
+ 
++	info = vd->vd_softc;
++
+ 	/* Don't try to put off screen pixels */
+ 	if (((left + width) > info->fb_width) || ((top + height) >
+ 	    info->fb_height))