diff options
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch | 39 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 7 |
2 files changed, 42 insertions, 4 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], diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 9c967db254..bffcc4cdee 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,10 +1,10 @@ PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r3" +PR = "r4" LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -41,7 +41,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ -# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \ " SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -63,4 +63,3 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" - |