summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-20 22:36:14 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-20 22:36:14 +0000
commitd1a1ed1d523276cc370b818b1e408af743165e60 (patch)
tree90aecb92155f8039a7181f8878ea859ef81dff13 /meta/packages/xorg-xserver
parent9c932b8a31e465c437ceb11a2cfcfd6b514ca8d8 (diff)
downloadpoky-d1a1ed1d523276cc370b818b1e408af743165e60.tar.gz
xserver-kdrive-xomap: Really disable xkb, fixing keys
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3837 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch82
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch54
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb2
3 files changed, 83 insertions, 55 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch
new file mode 100644
index 0000000000..9c38156cd2
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch
@@ -0,0 +1,82 @@
1Index: xorg-server-1.1.99.3/Makefile.am
2===================================================================
3--- xorg-server-1.1.99.3.orig/Makefile.am 2008-02-20 22:22:56.000000000 +0000
4+++ xorg-server-1.1.99.3/Makefile.am 2008-02-20 22:23:22.000000000 +0000
5@@ -34,6 +34,11 @@
6 XSP_DIR=xsp
7 endif
8
9+if XKB
10+XKB_DIR=xkb
11+endif
12+
13+
14 SUBDIRS = \
15 doc \
16 include \
17@@ -46,7 +51,7 @@
18 randr \
19 render \
20 Xi \
21- xkb \
22+ $(XKB_DIR) \
23 $(DBE_DIR) \
24 $(MFB_DIR) \
25 $(AFB_DIR) \
26Index: xorg-server-1.1.99.3/configure.ac
27===================================================================
28--- xorg-server-1.1.99.3.orig/configure.ac 2008-02-20 22:04:15.000000000 +0000
29+++ xorg-server-1.1.99.3/configure.ac 2008-02-20 22:28:35.000000000 +0000
30@@ -434,6 +434,7 @@
31 AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Build D-BUS support (default: auto)]), [DBUS=$enableval], [DBUS=auto])
32 AC_ARG_ENABLE(xsp, AS_HELP_STRING([--disable-xsp], [Build XSP support (default: auto)]), [XSP=$enableval], [XSP=auto])
33 AC_ARG_ENABLE(tslib, AS_HELP_STRING([--disable-tslib], [Build embedded touchscreen support (default: auto)]), [TSLIB=$enableval], [TSLIB=auto])
34+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
35
36 dnl DDXes.
37 AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
38@@ -751,12 +752,15 @@
39
40 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
41
42-AC_DEFINE(XKB, 1, [Build XKB])
43-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
44-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
45-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
46-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
47-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
48+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
49+if test "x$XKB" = xyes; then
50+ AC_DEFINE(XKB, 1, [Build XKB])
51+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
52+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
53+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
54+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
55+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
56+fi
57
58 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
59 [Do not have `strcasecmp'.]))
60Index: xorg-server-1.1.99.3/hw/kdrive/src/Makefile.am
61===================================================================
62--- xorg-server-1.1.99.3.orig/hw/kdrive/src/Makefile.am 2008-02-20 22:28:04.000000000 +0000
63+++ xorg-server-1.1.99.3/hw/kdrive/src/Makefile.am 2008-02-20 22:28:31.000000000 +0000
64@@ -39,4 +39,4 @@
65 libkdrivestubs_a_SOURCES = \
66 $(top_srcdir)/fb/fbcmap.c
67
68-libkdrivexkb_a_SOURCES = kxkb.c
69+libkdrivexkb_a_SOURCES =
70Index: xorg-server-1.1.99.3/hw/kdrive/src/kinput.c
71===================================================================
72--- xorg-server-1.1.99.3.orig/hw/kdrive/src/kinput.c 2008-02-20 22:25:58.000000000 +0000
73+++ xorg-server-1.1.99.3/hw/kdrive/src/kinput.c 2008-02-20 22:27:29.000000000 +0000
74@@ -777,7 +777,7 @@
75 KdInitModMap(ki);
76 KdInitAutoRepeats(ki);
77
78-#ifndef XKB
79+#ifdef XKB
80 if (!noXkbExtension) {
81 memset(&names, 0, sizeof(XkbComponentNamesRec));
82 if (XkbInitialMap)
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch
deleted file mode 100644
index d9ef51c5ba..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
2+++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
3@@ -35,6 +35,10 @@
4 XINPUT_DIR=Xi
5 endif
6
7+if XKB
8+XKB_DIR=xkb
9+endif
10+
11 if DBE
12 DBE_DIR=dbe
13 endif
14@@ -51,7 +55,7 @@
15 randr \
16 render \
17 $(XINPUT_DIR) \
18- xkb \
19+ $(XKB_DIR) \
20 $(DBE_DIR) \
21 $(MFB_DIR) \
22 $(AFB_DIR) \
23--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
24+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
25@@ -418,6 +418,7 @@
26 AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
27 AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
28 AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
29+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
30
31 dnl DDXes.
32 AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
33@@ -739,12 +740,15 @@
34
35 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
36
37-AC_DEFINE(XKB, 1, [Build XKB])
38-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
39-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
40-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
41-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
42-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
43+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
44+if test "x$XKB" = xyes; then
45+ AC_DEFINE(XKB, 1, [Build XKB])
46+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
47+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
48+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
49+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
50+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
51+fi
52
53 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
54 [Do not have `strcasecmp'.]))
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 372971e2ed..bbec18fbd7 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -23,10 +23,10 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1
23 file://fixups.patch;patch=1 \ 23 file://fixups.patch;patch=1 \
24 file://button_only.patch;patch=1 \ 24 file://button_only.patch;patch=1 \
25 file://calibrateext.patch;patch=1 \ 25 file://calibrateext.patch;patch=1 \
26 file://disable-xkb.patch;patch=1 \
26 file://xcalibrate_coords.patch;patch=1" 27 file://xcalibrate_coords.patch;patch=1"
27# file://kdrive-evdev.patch;patch=1 \ 28# file://kdrive-evdev.patch;patch=1 \
28# file://kdrive-use-evdev.patch;patch=1 \ 29# file://kdrive-use-evdev.patch;patch=1 \
29# file://optional-xkb.patch;patch=1 \
30# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ 30# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
31# file://enable-tslib.patch;patch=1 \ 31# file://enable-tslib.patch;patch=1 \
32# file://xfbdev-fb-opt.patch;patch=1" 32# file://xfbdev-fb-opt.patch;patch=1"