summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2007-10-29 14:04:27 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2007-10-29 14:04:27 +0000
commit88e6e25580a8ce1b81cde6b5cd9fac812ce3d56a (patch)
tree0fc19f588d2d937d02fdccede755f423b8c199e4 /x11-servers
parentThis is a replacement/upgrade for the net-mgmt/wispy-tools port. The (diff)
Add temporary fix for LEDs. Proper fix will be available in next
xorg-server release but this one has been deemed good enough for now. Obtained from: fd.o bugzilla
Notes
Notes: svn path=/head/; revision=202292
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/files/patch-dix_devices.c20
2 files changed, 21 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index dd6d8c052f73..2c2dade60736 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
diff --git a/x11-servers/xorg-server/files/patch-dix_devices.c b/x11-servers/xorg-server/files/patch-dix_devices.c
new file mode 100644
index 000000000000..f02738d39a20
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-dix_devices.c
@@ -0,0 +1,20 @@
+--- dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200
++++ dix/devices.c 2007-10-23 17:50:38.000000000 -0200
+@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
+ static void
+ CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+ {
++#ifdef XKB
++ if (!noXkbExtension) {
++ DeviceIntPtr dev = (DeviceIntPtr)
++ pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
++
++ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
++ (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
++ }
++#else
+ return;
++#endif
+ }
+
+ /**