From f64bd605f98bc0fb8f5709b48f4098feaf09bce3 Mon Sep 17 00:00:00 2001 From: fake Date: Thu, 25 Nov 2004 12:22:28 +0000 Subject: [PATCH] fake: xorg: add sparc patches to xorg, also. fixes xorg compile on sparc [2004112120452527812] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4811 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xorg/sparc-bus-26headers.patch | 29 +++++++++++++ .../xorg/sparc-keyboard-def-26headers.patch | 41 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 package/x11/xorg/sparc-bus-26headers.patch create mode 100644 package/x11/xorg/sparc-keyboard-def-26headers.patch diff --git a/package/x11/xorg/sparc-bus-26headers.patch b/package/x11/xorg/sparc-bus-26headers.patch new file mode 100644 index 000000000..48c9db264 --- /dev/null +++ b/package/x11/xorg/sparc-bus-26headers.patch @@ -0,0 +1,29 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x11/xfree86/sparc-bus-26headers.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- 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/xorg/sparc-keyboard-def-26headers.patch b/package/x11/xorg/sparc-keyboard-def-26headers.patch new file mode 100644 index 000000000..c01622ef8 --- /dev/null +++ b/package/x11/xorg/sparc-keyboard-def-26headers.patch @@ -0,0 +1,41 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x11/xfree86/sparc-keyboard-def-26headers.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- 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