aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-03-01 16:22:20 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-03-01 16:58:53 +0100
commit98278bf81f9b6f5858da7beabcd505f5ecf60635 (patch)
tree4ce07c41d448de13e66d6a55ae60b7924c34226a
parent0d6078ea083918683dfc8d2f39fd631caace99d7 (diff)
downloadopenembedded-98278bf81f9b6f5858da7beabcd505f5ecf60635.tar.gz
openembedded-98278bf81f9b6f5858da7beabcd505f5ecf60635.tar.bz2
openembedded-98278bf81f9b6f5858da7beabcd505f5ecf60635.zip
xorg-xserver-common: move DISTRO_XORG_CONFIG_MANAGER from RDEPENDS to DEPENDS, because configure checks hal availability. Thanks to gilligan for reporting.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/xorg-xserver/xorg-xserver-common.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index af96c50415..a72812c22f 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -6,13 +6,13 @@ INC_PR = "r14"
PROVIDES = "virtual/xserver"
-# Config manager for xserver, options are: hal, libudev, empty (for configuration in xorg.conf)
+# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
DISTRO_XORG_CONFIG_MANAGER ?= "hal"
DISTRO_XORG_CONFIG_MANAGER_shr ?= ""
# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
-CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['libudev']]}"
+CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
@@ -22,9 +22,7 @@ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
-libxv"
-
-RDEPENDS = "${DISTRO_XORG_CONFIG_MANAGER}"
+libxv ${DISTRO_XORG_CONFIG_MANAGER}"
RRECOMMENDS_${PN} = "libpciaccess"