diff options
author | Koen Kooi <koen@openembedded.org> | 2006-09-10 08:59:47 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-09-10 08:59:47 +0000 |
commit | 62a86cd1cae6025b0234889119507af43f5bc24a (patch) | |
tree | 8c9d932efded8eae2a74fa8aa5e63ae19f602205 /packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch | |
parent | 88bdba6d70a69e84781612060954e2f73ab07b6e (diff) | |
parent | bd246d9a4b143fa5766e9b2d86676d35971ecef6 (diff) |
merge of '15617f31c93e5e7e35627af8b363148f69541579'
and 'c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a'
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch')
-rw-r--r-- | packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], |