summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorPieter G <pieterg@gmx.com>2008-04-17 10:30:57 +0000
committerKoen Kooi <koen@openembedded.org>2008-04-17 10:30:57 +0000
commitaf0a81dac0690338e3e6f194b10bc5970e3eabf9 (patch)
tree4bbf41e8525ef88e23ef32509485fe23324aafbc /packages/xorg-xserver
parent35599625edd96d80d11c079c44fa9c7ba0e608e4 (diff)
xserver-kdrive 1.4.99.901: allow builds without xkb
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch12
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb7
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch
new file mode 100644
index 0000000000..779aa2d6ef
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch
@@ -0,0 +1,12 @@
+--- dix/devices.c~ 2008-04-16 13:01:08.000000000 +0200
++++ dix/devices.c 2008-04-16 13:01:08.000000000 +0200
+@@ -527,8 +527,8 @@
+ #ifdef XKB
+ if (dev->key->xkbInfo)
+ XkbFreeInfo(dev->key->xkbInfo);
+-#endif
+ dev->key->xkbInfo = NULL;
++#endif
+ xfree(dev->key->curKeySyms.map);
+ xfree(dev->key->modifierKeyMap);
+ xfree(dev->key);
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 6361f50db4..9579d79d4e 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -5,7 +5,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
DEFAULT_PREFERENCE = "-99"
PE = "1"
-PR = "r0"
+PR = "r1"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -24,6 +24,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://keyboard-resume-workaround.patch;patch=1 \
file://xorg-avr32-support.diff;patch=1 \
# file://pkgconfig_fix.patch;patch=1 \
+ file://no_xkb.patch;patch=1;pnum=0 \
"
S = "${WORKDIR}/xorg-server-${PV}"
@@ -31,4 +32,6 @@ S = "${WORKDIR}/xorg-server-${PV}"
W100_OECONF = "--disable-w100"
W100_OECONF_arm = "--enable-w100"
-EXTRA_OECONF += "--enable-builtin-fonts"
+EXTRA_OECONF += "--enable-builtin-fonts \
+ --disable-dri2 \
+ "