mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

xserver-xorg: make DRI/GLX options respect opengl distro feature

Browse Source 
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>
This commit is contained in:
Ross Burton
2012-09-07 11:49:25 +01:00
committed by Richard Purdie
parent 887a731468
commit 9b92449de1
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
View File

@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
PR = "r6"
PR = "r7"

16
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
View File

@@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \
ac_cv_file__usr_share_sgml_X11_defs_ent=no \
"
PACKAGECONFIG ??= "udev"
PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
--disable-dri --disable-glx,\
xf86driproto dri2proto mesa-dri"
do_install_append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
}
# Mesa/GLX/DRI
PROTO_DEPS += "xf86driproto dri2proto"
LIB_DEPS += "mesa-dri"
EXTRA_OECONF += "\
--enable-dri \
--enable-dri2 \
--enable-glx-tls \
"