diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch new file mode 100644 index 0000000000..a580b500b7 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | Index: xorg-server-1.2.0/Makefile.am | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100 | ||
4 | +++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200 | ||
5 | @@ -30,6 +30,10 @@ | ||
6 | XINPUT_DIR=Xi | ||
7 | endif | ||
8 | |||
9 | +if XKB | ||
10 | +XKB_DIR=xkb | ||
11 | +endif | ||
12 | + | ||
13 | if DBE | ||
14 | DBE_DIR=dbe | ||
15 | endif | ||
16 | @@ -46,7 +50,7 @@ | ||
17 | randr \ | ||
18 | render \ | ||
19 | $(XINPUT_DIR) \ | ||
20 | - xkb \ | ||
21 | + $(XKB_DIR) \ | ||
22 | $(DBE_DIR) \ | ||
23 | $(MFB_DIR) \ | ||
24 | $(AFB_DIR) \ | ||
25 | Index: xorg-server-1.2.0/configure.ac | ||
26 | =================================================================== | ||
27 | --- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100 | ||
28 | +++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200 | ||
29 | @@ -428,6 +428,7 @@ | ||
30 | AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) | ||
31 | AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) | ||
32 | AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) | ||
33 | +AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) | ||
34 | |||
35 | dnl DDXes. | ||
36 | AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) | ||
37 | @@ -754,12 +755,15 @@ | ||
38 | |||
39 | AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) | ||
40 | |||
41 | -AC_DEFINE(XKB, 1, [Build XKB]) | ||
42 | -AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | ||
43 | -AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | ||
44 | -REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | ||
45 | -XKB_LIB='$(top_builddir)/xkb/libxkb.la' | ||
46 | -XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | ||
47 | +AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) | ||
48 | +if test "x$XKB" = xyes; then | ||
49 | + AC_DEFINE(XKB, 1, [Build XKB]) | ||
50 | + AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | ||
51 | + AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | ||
52 | + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | ||
53 | + XKB_LIB='$(top_builddir)/xkb/libxkb.la' | ||
54 | + XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | ||
55 | +fi | ||
56 | |||
57 | AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, | ||
58 | [Do not have `strcasecmp'.])) | ||