xserver-xorg: move config manager logic to .inc, remove hal dependency where not specified by new DISTRO_XORG_CONFIG_MANAGER option

* distribution can specify DISTRO_XORG_CONFIG_MANAGER to select between
  hal, udev, no dynamic input device detection (only xorg.conf)
* fix RRECOMMENDS spelling and remove hal from it
* use CONFIG_MANAGER_OPTION in 1.7.4 and 1.8 RC1 (git) version

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 17 insertions, 9 deletions

diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index 438da8110d..af96c50415 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -2,11 +2,19 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 PROVIDES = "virtual/xserver"
 
-DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ 
+# Config manager for xserver, options are: hal, libudev, 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']]}"
+
+DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ 
 xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
 xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
 scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
@@ -16,7 +24,9 @@ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
 libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
 libxv"
 
-RECOMMENDS_${PN} = "hal libpciaccess"
+RDEPENDS = "${DISTRO_XORG_CONFIG_MANAGER}"
+
+RRECOMMENDS_${PN} = "libpciaccess"
 
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2;name=archive"
@@ -34,6 +44,8 @@ EXTRA_OECONF += " --enable-xcalibrate \
                   --with-default-font-path="/usr/share/fonts/X11/misc" \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
+# CONFIG_MANAGER_OPTION is used only in recipes which support those options
+
 EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
 
 PACKAGES =+ "xserver-security-policy"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
index 55b7a6de76..5ef62fdefa 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -21,7 +21,7 @@ do_install_prepend() {
 # The NVidia driver requires Xinerama support in the X server. Ion uses it.
 XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
 
-EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
 EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
 
 export LDFLAGS += " -ldl "
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 5f683c4d1e..3fdad01abe 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -31,10 +31,6 @@ do_install_prepend() {
 # The NVidia driver requires Xinerama support in the X server. Ion uses it.
 XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
 
-# hal, udev or disable both
-DISTRO_XORG_CONFIG_MANAGER ?= "--enable-config-hal --disable-config-udev"
-DISTRO_XORG_CONFIG_MANAGER_shr ?= "--disable-config-udev --disable-config-hal"
-
-EXTRA_OECONF += " ${DISTRO_XORG_CONFIG_MANAGER} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
 
 export LDFLAGS += " -ldl "