xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3aa2c8a06890b3384ce9b18e3bc8c2f68c..17d456cb5c794cc64522e8308d9727b04ef6f395 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -35,3 +35,8 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 SRC_URI += "file://macro_tweak.patch"
 
 EXTRA_OECONF = "--with-fop=no"
+
+PACKAGECONFIG ??= "udev"
+PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
+PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
+

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index 3aca760d9c7fe43bf46e6bbf2a6409b869204b80..6b138732d0c4f3932eaff9fc990de613859e4a5a 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -6,7 +6,7 @@ LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm
 
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
 
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
+RDEPENDS_${PN} += "xorg-minimal-fonts"
 
 FILES_${PN} += "${bindir}/Xorg "
 
@@ -34,4 +34,3 @@ EXTRA_OECONF += "--disable-static \
 
 # Due to mesa-dri
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
index 035e39c99695e470f481812821d8c73c7410b064..b797f9701f802d70f5030b1aa11e13bbdf1ab62a 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
 DEPENDS += "font-util"
 
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://crosscompile.patch"
 

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 066ff1327157e9b476adddfd21837d311396daa4..87ba04025fba53734bcc679367fabc96cda63332 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
 PE = "1"
-PR = "r1"
+PR = "r3"
 PV = "1.10+git${SRCPV}"
 
 PROTO_DEPS += "xf86driproto dri2proto"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 54470580fd590c7168f75859307ce604baab91bb..131c258e8276b8c6b6819530cfa6d8f2e2ba1216 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -8,7 +8,7 @@ LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile lib
 
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
 
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
+RDEPENDS_${PN} += "xorg-minimal-fonts"
 
 FILES_${PN} += "${bindir}/Xorg "
 

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
index 5575c0f7bbfb4324bcb2bc700ca847feb61eaa81..e42f27d587099cfdafc5a805574ab808d63c01e8 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
-PR = "r1"
+PR = "r3"
 
 DEPENDS += "font-util"