summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-11-23 18:50:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:06 +0000
commit20291f3d081ac83b5b2700df4d8ec2d85e77c5aa (patch)
treec12ed31800a6a668b8a2adb0873f435ee086938c /meta
parenta791139329c003da2d0fbfc9f69daf0011790ba0 (diff)
downloadpoky-20291f3d081ac83b5b2700df4d8ec2d85e77c5aa.tar.gz
xserver-xorg: only use --disable-dga in xserver-xorg-lite
Xorg VESA driver calls DGAInit enforcing this symbol to be available to the driver to work so we revert back to only disable DGA for lite flavor of Xorg. (From OE-Core rev: f5546a175384de338edc23a248b19a23fb7d7017) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc1
3 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
index 2c5bb0aa57..8b0808d8de 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
@@ -3,7 +3,7 @@ SRC_URI += "file://crosscompile.patch"
3# Misc build failure for master HEAD 3# Misc build failure for master HEAD
4SRC_URI += "file://fix_open_max_preprocessor_error.patch" 4SRC_URI += "file://fix_open_max_preprocessor_error.patch"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d" 8SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
9SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6" 9SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 255939718e..c1a552ec72 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -100,7 +100,6 @@ EXTRA_OECONF += "--with-fop=no \
100 --disable-acfb \ 100 --disable-acfb \
101 --disable-ccfb \ 101 --disable-ccfb \
102 --disable-mcfb \ 102 --disable-mcfb \
103 --disable-dga \
104 --disable-xinerama \ 103 --disable-xinerama \
105 --disable-xf86misc \ 104 --disable-xf86misc \
106 --disable-xorgcfg \ 105 --disable-xorgcfg \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index be84e9e3f7..57615f5299 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -3,4 +3,5 @@ require xserver-xorg-common.inc
3EXTRA_OECONF += "\ 3EXTRA_OECONF += "\
4 --disable-dri \ 4 --disable-dri \
5 --disable-glx \ 5 --disable-glx \
6 --disable-dga \
6" 7"