diff options
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-04-05 23:30:16 -0500
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-04-08 11:38:57 -0500
commit8c0bb1be455411ab2d4001a5b3f79c80b19dffc8 (patch)
parent5e314278e4cf37b7fbb2946f4f42a3236071e131 (diff)
libva: disable wayland
Make libva honor the wayland DISTRO feature setting in theory; in practice, we always disable it for the time being. Enabling it produces a build failure in the libva wayland test code. Examining the problematic call, it seems quite different from what wayland puts in the sysroot, which means either that the test code is out of date, or we have a version mismatch between the wayland libva support and the wayland support in oe-core. Since wayland support is secondary to having basic libva support in dylan, we unconditionally disable it for now, until we have more time after the release to investigate. Fixes [YOCTO #3932]. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
1 files changed, 3 insertions, 0 deletions
diff --git a/common/recipes-multimedia/libva/libva.inc b/common/recipes-multimedia/libva/libva.inc
index ca14fe07..01766d26 100644
--- a/common/recipes-multimedia/libva/libva.inc
+++ b/common/recipes-multimedia/libva/libva.inc
@@ -23,6 +23,9 @@ DEPENDS = "libxext libxfixes libdrm mesa"
inherit autotools pkgconfig
+# Unconditionally turn wayland off for now
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'wayland', '--disable-wayland', '--disable-wayland', d)}"
PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"