From 9bf7ce9b13e70ea4fb91b716c3a472ec3ed8548a Mon Sep 17 00:00:00 2001 From: fake Date: Sat, 18 Sep 2004 19:16:40 +0000 Subject: [PATCH] fake: fix xfree86 compile on sparc32 with 2.6 kernel headers. this still needs to be tested with 2.4 headers - wip [2004082303460608744] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4229 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/sparc-bus-26headers.patch | 21 ++++++++++++++++++ .../sparc-keyboard-def-26headers.patch | 22 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 package/x11/xfree86/sparc-bus-26headers.patch create mode 100644 package/x11/xfree86/sparc-keyboard-def-26headers.patch diff --git a/package/x11/xfree86/sparc-bus-26headers.patch b/package/x11/xfree86/sparc-bus-26headers.patch new file mode 100644 index 000000000..ff283435a --- /dev/null +++ b/package/x11/xfree86/sparc-bus-26headers.patch @@ -0,0 +1,21 @@ +--- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2004-08-22 23:09:02.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2004-08-22 23:10:51.000000000 +0200 +@@ -196,6 +196,8 @@ + * master aborts are avoided during PCI scans). + */ + ++#include ++typedef unsigned long kernel_ulong_t; + #include + + #ifndef PCIIOC_BASE /* Ioctls for /proc/bus/pci/X/Y nodes. */ +--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig 2004-08-22 23:15:10.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-08-22 23:15:25.000000000 +0200 +@@ -27,6 +27,7 @@ + + #if defined(linux) + #include ++#include + #include + #include + #elif defined(SVR4) diff --git a/package/x11/xfree86/sparc-keyboard-def-26headers.patch b/package/x11/xfree86/sparc-keyboard-def-26headers.patch new file mode 100644 index 000000000..d7cc9f9a8 --- /dev/null +++ b/package/x11/xfree86/sparc-keyboard-def-26headers.patch @@ -0,0 +1,22 @@ +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2004-08-21 16:22:07.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-08-21 19:54:02.000000000 +0200 +@@ -102,7 +102,7 @@ + + /* Deal with spurious kernel header change */ + #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__) + # define rate period + # endif + #endif +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2004-08-21 16:22:07.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-08-21 19:53:22.000000000 +0200 +@@ -75,7 +75,7 @@ + + /* Deal with spurious kernel header change */ + #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__) + # define rate period + # endif + #endif