diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 | 39 |
1 files changed, 39 insertions, 0 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 new file mode 100644 index 0000000000..ccc19139c8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | Index: xorg-server-1.3.0.0/configure.ac | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200 | ||
4 | +++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200 | ||
5 | @@ -520,7 +520,11 @@ | ||
6 | XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' | ||
7 | |||
8 | dnl Core modules for most extensions, et al. | ||
9 | +if test "$KDRIVE" = yes; then | ||
10 | +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]" | ||
11 | +else | ||
12 | 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]" | ||
13 | +fi | ||
14 | REQUIRED_LIBS="xfont xau fontenc" | ||
15 | |||
16 | AM_CONDITIONAL(XV, [test "x$XV" = xyes]) | ||
17 | @@ -1603,7 +1607,9 @@ | ||
18 | AC_SUBST(XKB_COMPILED_DIR) | ||
19 | |||
20 | dnl and the rest of these are generic, so they're in config.h | ||
21 | +if test ! x"$KDRIVE" = xyes; then | ||
22 | AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) | ||
23 | +fi | ||
24 | AC_DEFINE(XResExtension, 1, [Build XRes extension]) | ||
25 | |||
26 | AC_TRY_COMPILE([ | ||
27 | @@ -1616,10 +1622,12 @@ | ||
28 | |||
29 | AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) | ||
30 | |||
31 | +if test ! "x$KDRIVE" = xyes ; then | ||
32 | dnl xorgconfig CLI configuration utility | ||
33 | PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) | ||
34 | AC_SUBST(XORGCONFIG_DEP_CFLAGS) | ||
35 | AC_SUBST(XORGCONFIG_DEP_LIBS) | ||
36 | +fi | ||
37 | |||
38 | dnl xorgcfg GUI configuration utility | ||
39 | AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], | ||