From 3b05a9beffafe5637fba36dbd301139e912ec2a4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 20 Aug 2012 11:25:18 +0100 Subject: mesa: clean up PACKAGECONFIG Use machine overrides instead of machine features. (From OE-Core rev: 821a38d71d7e15f5871f44a3ee08268d05ef610e) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-common.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index de171f0845..cfe4a37c0c 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -12,7 +12,7 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" -INC_PR = "r2" +INC_PR = "r3" PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" @@ -29,9 +29,8 @@ EXTRA_OECONF = "--enable-glu \ --disable-glut \ --enable-shared-glapi" -PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ - ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_append_x86 = " gles egl" X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" -- cgit v1.2.3-54-g00ecf