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/disable-xf86-dga-xorgcfg.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/disable-xf86-dga-xorgcfg.patch')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..9c43e52ead --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | --- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 | ||
2 | +++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 | ||
3 | @@ -505,7 +505,11 @@ | ||
4 | XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' | ||
5 | |||
6 | dnl Core modules for most extensions, et al. | ||
7 | +if test "$KDRIVE" = yes; then | ||
8 | +REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto" | ||
9 | +else | ||
10 | REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" | ||
11 | +fi | ||
12 | REQUIRED_LIBS="xfont xau fontenc" | ||
13 | |||
14 | AM_CONDITIONAL(XV, [test "x$XV" = xyes]) | ||
15 | @@ -1514,7 +1526,9 @@ | ||
16 | AC_SUBST(XKB_COMPILED_DIR) | ||
17 | |||
18 | dnl and the rest of these are generic, so they're in config.h | ||
19 | +if test ! x"$KDRIVE" = xyes; then | ||
20 | AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) | ||
21 | +fi | ||
22 | AC_DEFINE(XResExtension, 1, [Build XRes extension]) | ||
23 | |||
24 | dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined | ||
25 | @@ -1534,10 +1548,12 @@ | ||
26 | |||
27 | AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) | ||
28 | |||
29 | +if test ! "x$KDRIVE" = xyes ; then | ||
30 | dnl xorgconfig CLI configuration utility | ||
31 | PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) | ||
32 | AC_SUBST(XORGCONFIG_DEP_CFLAGS) | ||
33 | AC_SUBST(XORGCONFIG_DEP_LIBS) | ||
34 | +fi | ||
35 | |||
36 | dnl xorgcfg GUI configuration utility | ||
37 | AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], | ||