summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-23 00:47:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:19:53 (GMT)
commit9c89aa1fd9b3ec09e52c464ad85d4b58d8bad417 (patch)
treea0d966a74116748a73f2b4ecb3a9ff1c3a88f3c1
parentb4f012af6252b43c2b5e5551de81d56deac3fae1 (diff)
downloadpoky-9c89aa1fd9b3ec09e52c464ad85d4b58d8bad417.tar.gz
xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG
* it was enabled when dri2proto was built before xserver-xorg (From OE-Core rev: 6014223d1527a6fd870b68cbefb9194a079a5d2c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index bea0252..1372667 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -126,7 +126,7 @@ EXTRA_OECONF += "--with-fop=no \
126PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" 126PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}"
127PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 127PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
128PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ 128PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
129 --disable-dri --disable-glx,\ 129 --disable-dri --disable-dri2 --disable-glx,\
130 xf86driproto dri2proto mesa-dri" 130 xf86driproto dri2proto mesa-dri"
131 131
132do_install_append () { 132do_install_append () {
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
index a219f81..cf74559 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
@@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \
10SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 10SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
11SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" 11SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
12 12
13PR = "r10" 13PR = "r11"