summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index 631c111df7..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5Index: xorg-server-1.3.0.0/configure.ac
6===================================================================
7--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
8+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
9@@ -520,7 +520,11 @@
10 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
11
12 dnl Core modules for most extensions, et al.
13+if test "$KDRIVE" = yes; then
14+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
15+else
16 REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
17+fi
18 REQUIRED_LIBS="xfont xau fontenc"
19
20 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
21@@ -1603,7 +1607,9 @@
22 AC_SUBST(XKB_COMPILED_DIR)
23
24 dnl and the rest of these are generic, so they're in config.h
25+if test ! x"$KDRIVE" = xyes; then
26 AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
27+fi
28 AC_DEFINE(XResExtension, 1, [Build XRes extension])
29
30 AC_TRY_COMPILE([
31@@ -1616,10 +1622,12 @@
32
33 AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
34
35+if test ! "x$KDRIVE" = xyes ; then
36 dnl xorgconfig CLI configuration utility
37 PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
38 AC_SUBST(XORGCONFIG_DEP_CFLAGS)
39 AC_SUBST(XORGCONFIG_DEP_LIBS)
40+fi
41
42 dnl xorgcfg GUI configuration utility
43 AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],