diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-03-28 15:32:21 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-03-28 15:32:21 +0000 |
| commit | f4f68b661bf5ba29ee8f05a8d04bc9e24ee7c881 (patch) | |
| tree | 826b29357fa3ecc89992237f9a1aaaa31911f52f /packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch | |
| parent | 285e3fcf035e239f072df60c5c323a20e21cd07a (diff) | |
xserver-kdrive: change git version to use xserver-kdrive-common.inc
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.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], |