summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries/files/patch-2
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-25 23:04:52 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-25 23:04:52 +0000
commit984a75e189f8032fdc9c22cb74ee524c9c5f229b (patch)
tree9d805fa2f35da750e77d677f6098022710d037b6 /x11/XFree86-4-libraries/files/patch-2
parentAdd CURL support. (diff)
update to 4.0.3.
o use internal freetype2 for consistency with x11/XFree86-4. o added xthreads obtained from x11/XFree86-4. o install "ws" type config sample for xdm. o build DRI only if kernel source installed in /sys. o fix Riva128/SGRAM driver(patch-riva_hw.c). PR: 24338(4.0.2) Submitted by: maintainer, keith
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-2')
-rw-r--r--x11/XFree86-4-libraries/files/patch-226
1 files changed, 21 insertions, 5 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-2 b/x11/XFree86-4-libraries/files/patch-2
index 9a21575f9c0e..98d660a8c113 100644
--- a/x11/XFree86-4-libraries/files/patch-2
+++ b/x11/XFree86-4-libraries/files/patch-2
@@ -1,10 +1,26 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c~ Sun Aug 2 08:43:34 1998
-+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Mon Oct 11 02:27:32 1999
-@@ -97,7 +97,6 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Sun Jul 26 01:56:34 1998
++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Fri Jan 5 09:48:25 2001
+@@ -56,6 +56,7 @@
+ int changed = 0;
+ int timeinmicros;
+ struct joystick js;
++ extern int errno;
+
+ #ifdef DEBUG
+ ErrorF("xf86JoystickOn: %s\n", name);
+@@ -96,7 +97,6 @@
+ if (*centerY < 0) {
*centerY = js.y;
xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
- }
-- }
+- }
+ }
return status;
+@@ -173,6 +173,7 @@
}
+
+ #ifdef XFree86LOADER
++#define MAGIC_DONE 1
+ /*
+ * Entry point for XFree86 Loader
+ */