Patchwork xf86-video-vmware: respect opengl DISTRO_FEATURE

login
register
mail settings
Submitter Ross Burton
Date Sept. 11, 2013, 10:24 p.m.
Message ID <1378938297-9208-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/57853/
State Accepted
Commit 66b7c59442cc494179418995292c57bab56fada3
Headers show

Comments

Ross Burton - Sept. 11, 2013, 10:24 p.m.
Conditionalise the GL dependencies on the opengl DISTRO_FEATURE so this driver
can build without the opengl feature active, as the configure script will
enable/disable the GL sub-driver depending on the presence of these libraries.

This is an interim patch to fix the autobuilder, a more complete patch heading
upstream to make the GL sub-driver deterministic will follow.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
index 1526a02..0d8c8d2 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
@@ -6,8 +6,8 @@  DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
 
-DEPENDS += "virtual/libx11 libxvmc drm glproto \
-	    virtual/libgl xineramaproto libpciaccess"
+DEPENDS += "virtual/libx11 libxvmc xineramaproto libpciaccess \
+            ${@base_contains('DISTRO_FEATURES', 'opengl', 'drm virtual/libgl', '', d)}"
 
 SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08"
 SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d"