diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-03 13:29:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:35 +0100 |
commit | e65e8ff4bedb9a36563d5ddfe8e36b4b243b20d3 (patch) | |
tree | 1ebcc4c25b2e5dc7efc5514a0b695bb92de9e060 /meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch | |
parent | 4c80e07e6ca8d1ad13938067c66dd0801da90fb6 (diff) | |
download | poky-e65e8ff4bedb9a36563d5ddfe8e36b4b243b20d3.tar.gz |
xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
(From OE-Core rev: c7b77b3a1f34f3d2536251c0ad9e43031473e57e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 43 |
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 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
4 | |||
5 | Index: 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], | ||