[oe-commits] Martin Jansa : xorg-xserver-common: move DISTRO_XORG_CONFIG_MANAGER from RDEPENDS to DEPENDS, because configure checks hal availability. Thanks to gilligan for reporting.

git version control git at git.openembedded.org
Mon Mar 1 16:01:49 UTC 2010


Module: openembedded.git
Branch: shr/unstable
Commit: 98278bf81f9b6f5858da7beabcd505f5ecf60635
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=98278bf81f9b6f5858da7beabcd505f5ecf60635

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Mar  1 16:22:20 2010 +0100

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 at gmail.com>

---

 recipes/xorg-xserver/xorg-xserver-common.inc |    8 +++-----
 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 af96c50..a72812c 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"
 





More information about the Openembedded-commits mailing list