diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch | |
parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
download | poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch new file mode 100644 index 0000000000..d9ef51c5ba --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch | |||
@@ -0,0 +1,54 @@ | |||
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'.])) | ||