diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-30 18:07:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:52:12 -0700 |
commit | 175ba20246fa3889f409d1b4e7f828897867b70e (patch) | |
tree | e19193aa0696bbeb0f0fcbf3112cdbb2e619ed99 /meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch | |
parent | 8cb5c0216750f690ce9208c54888d3729b1981bc (diff) | |
download | poky-175ba20246fa3889f409d1b4e7f828897867b70e.tar.gz |
xserver-kdrive: remove.
kdrive is effectively unmaintained upstream (it's only kept for Xephyr).
Apart from two headless machines in meta-yocto (patches sent), every BSP I
looked at (oe-core, meta-intel, meta-oe, meta-ti, meta-smartphone) is using the
traditional X.org X server. Changing kdrive to Xorg means an extra ~200kb of
disk usage but extra features and more importantly continued maintenance.
(From OE-Core rev: f8bc059883a9bae92434bfb74fca352ad1e10199)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch deleted file mode 100644 index af3c16c058..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
4 | |||
5 | Index: xorg-server-1.2.0/Makefile.am | ||
6 | =================================================================== | ||
7 | --- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100 | ||
8 | +++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200 | ||
9 | @@ -30,6 +30,10 @@ | ||
10 | XINPUT_DIR=Xi | ||
11 | endif | ||
12 | |||
13 | +if XKB | ||
14 | +XKB_DIR=xkb | ||
15 | +endif | ||
16 | + | ||
17 | if DBE | ||
18 | DBE_DIR=dbe | ||
19 | endif | ||
20 | @@ -46,7 +50,7 @@ | ||
21 | randr \ | ||
22 | render \ | ||
23 | $(XINPUT_DIR) \ | ||
24 | - xkb \ | ||
25 | + $(XKB_DIR) \ | ||
26 | $(DBE_DIR) \ | ||
27 | $(MFB_DIR) \ | ||
28 | $(AFB_DIR) \ | ||
29 | Index: xorg-server-1.2.0/configure.ac | ||
30 | =================================================================== | ||
31 | --- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100 | ||
32 | +++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200 | ||
33 | @@ -428,6 +428,7 @@ | ||
34 | AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) | ||
35 | AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) | ||
36 | AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) | ||
37 | +AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) | ||
38 | |||
39 | dnl DDXes. | ||
40 | AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) | ||
41 | @@ -754,12 +755,15 @@ | ||
42 | |||
43 | AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) | ||
44 | |||
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 | +AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) | ||
52 | +if test "x$XKB" = xyes; then | ||
53 | + AC_DEFINE(XKB, 1, [Build XKB]) | ||
54 | + AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | ||
55 | + AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | ||
56 | + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | ||
57 | + XKB_LIB='$(top_builddir)/xkb/libxkb.la' | ||
58 | + XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | ||
59 | +fi | ||
60 | |||
61 | AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, | ||
62 | [Do not have `strcasecmp'.])) | ||