summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-06 23:16:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 11:35:43 +0100
commit173c35a4524e262fd887b0dcb60bff24b7087852 (patch)
tree49503779605fea73d324ced4608df7c482593332 /meta
parentd7babed94f56ceb2f9218e6e5d28b9f8d8d04afa (diff)
downloadpoky-173c35a4524e262fd887b0dcb60bff24b7087852.tar.gz
xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev
(From OE-Core rev: 55fe7a29e059a3e09e04896b18bb751da3cd8530) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc5
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc3
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb2
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 \
35SRC_URI += "file://macro_tweak.patch" 35SRC_URI += "file://macro_tweak.patch"
36 36
37EXTRA_OECONF = "--with-fop=no" 37EXTRA_OECONF = "--with-fop=no"
38
39PACKAGECONFIG ??= "udev"
40PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
41PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
42
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
6 6
7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
8 8
9RDEPENDS_${PN} += "hal xorg-minimal-fonts" 9RDEPENDS_${PN} += "xorg-minimal-fonts"
10 10
11FILES_${PN} += "${bindir}/Xorg " 11FILES_${PN} += "${bindir}/Xorg "
12 12
@@ -34,4 +34,3 @@ EXTRA_OECONF += "--disable-static \
34 34
35# Due to mesa-dri 35# Due to mesa-dri
36COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 36COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
37
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"
7DEPENDS += "font-util" 7DEPENDS += "font-util"
8 8
9PE = "1" 9PE = "1"
10PR = "r1" 10PR = "r3"
11 11
12SRC_URI += "file://crosscompile.patch" 12SRC_URI += "file://crosscompile.patch"
13 13
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"
4 4
5SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f" 5SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
6PE = "1" 6PE = "1"
7PR = "r1" 7PR = "r3"
8PV = "1.10+git${SRCPV}" 8PV = "1.10+git${SRCPV}"
9 9
10PROTO_DEPS += "xf86driproto dri2proto" 10PROTO_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
8 8
9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
10 10
11RDEPENDS_${PN} += "hal xorg-minimal-fonts" 11RDEPENDS_${PN} += "xorg-minimal-fonts"
12 12
13FILES_${PN} += "${bindir}/Xorg " 13FILES_${PN} += "${bindir}/Xorg "
14 14
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
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" 3LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
4 4
5PR = "r1" 5PR = "r3"
6 6
7DEPENDS += "font-util" 7DEPENDS += "font-util"
8 8