diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-06 23:16:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-06 22:43:09 +0100 |
| commit | 55fe7a29e059a3e09e04896b18bb751da3cd8530 (patch) | |
| tree | 7b1fbd00ee106ffb9d046e79ac587526b8c2bf5f /meta | |
| parent | d0915fb0a2cc80ad45b3fd526d3b29a91d99572c (diff) | |
| download | openembedded-core-contrib-55fe7a29e059a3e09e04896b18bb751da3cd8530.tar.gz | |
xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
6 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc index 000aea3aa2..17d456cb5c 100644 --- 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 3aca760d9c..6b138732d0 100644 --- 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 035e39c996..b797f9701f 100644 --- 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 066ff13271..87ba04025f 100644 --- 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 54470580fd..131c258e82 100644 --- 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 5575c0f7bb..e42f27d587 100644 --- 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" |