summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-07 11:49:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 13:01:51 +0100
commit9b92449de1e5a43ad01d36c1938863210edce01b (patch)
treef4f94189ffb7d73548f1c3ce9523849dc4fd53f2
parent887a731468374c4b972ac21b488d567eadfa7609 (diff)
downloadpoky-9b92449de1e5a43ad01d36c1938863210edce01b.tar.gz
xserver-xorg: make DRI/GLX options respect opengl distro feature
If the distro doesn't have the opengl feature there's no point building the DRI or GLX support, making the mesa-dri build dependency optional. (From OE-Core rev: 73d02f6b121c8b0ed2d42de0bfd6c227fd4de41f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc16
2 files changed, 5 insertions, 13 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b4a348c1aa..c71896a3ed 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" 9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
10 10
11PR = "r6" 11PR = "r7"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index a0309aa7bb..210abadff1 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \
123 ac_cv_file__usr_share_sgml_X11_defs_ent=no \ 123 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
124" 124"
125 125
126PACKAGECONFIG ??= "udev" 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,\
129 --disable-dri --disable-glx,\
130 xf86driproto dri2proto mesa-dri"
128 131
129do_install_append () { 132do_install_append () {
130 # Its assumed base-files creates this for us 133 # Its assumed base-files creates this for us
131 rmdir ${D}${localstatedir}/log/ 134 rmdir ${D}${localstatedir}/log/
132} 135}
133
134
135# Mesa/GLX/DRI
136PROTO_DEPS += "xf86driproto dri2proto"
137LIB_DEPS += "mesa-dri"
138
139EXTRA_OECONF += "\
140 --enable-dri \
141 --enable-dri2 \
142 --enable-glx-tls \
143"