Author: branden
Date: 2004-01-16 17:08:03 -0500 (Fri, 16 Jan 2004)
New Revision: 926
Added:
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Fix another FTBFS on SPARC, this one hiding behind the previous one. The
SBUS bus support code uses symbols from the Linux kernel's fb.h header
file without #including it.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-16 19:06:22 UTC (rev 925)
+++ branches/4.3.0/sid/debian/changelog 2004-01-16 22:08:03 UTC (rev 926)
@@ -87,8 +87,13 @@
(Closes: #220814)
- debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 15 Jan 2004 12:29:23 -0500
+ * Fix another FTBFS on SPARC, this one hiding behind the previous one. The
+ SBUS bus support code uses symbols from the Linux kernel's fb.h header
+ file without #including it.
+ - debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 16 Jan 2004 17:05:24 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Added:
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
===================================================================
---
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
2004-01-16 19:06:22 UTC (rev 925)
+++
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
2004-01-16 22:08:03 UTC (rev 926)
@@ -0,0 +1,30 @@
+$Id$
+
+Sbus.c and xf86Sbus.h use symbols from the Linux fb.h header file.
+
+This patch by Branden Robinson.
+
+Not submitted upstream yet.
+
+--- xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c.orig 2004-01-16
14:04:04.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c 2004-01-16
14:19:33.000000000 -0500
+@@ -31,6 +31,9 @@
+ #ifdef sun
+ #include <sys/utsname.h>
+ #endif
++
++#include <linux/fb.h> /* for FB_CUR_SETALL and FB_CUR_SETCMAP */
++
+ #include "xf86.h"
+ #include "xf86Priv.h"
+ #include "xf86_OSlib.h"
+--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig
2004-01-16 14:34:14.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-01-16
14:34:01.000000000 -0500
+@@ -26,6 +26,7 @@
+ #define _XF86_SBUS_H
+
+ #if defined(linux)
++#include <linux/fb.h> /* for fbcurpos */
+ #include <asm/types.h>
+ #include <asm/fbio.h>
+ #include <asm/openpromio.h>
Property changes on:
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
___________________________________________________________________
Name: svn:keywords
+ Id
