From f780ec28cbaade55361390a04ac70574bde426de Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 13 Jun 2013 01:19:58 +0200 Subject: mesa: introduce PACKAGECONFIG for dri * move DEPENDS which were originally applied only for mesa-dri to dri PACKAGECONFIG Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 3f00237f71..ec30301840 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -14,7 +14,7 @@ LICENSE = "MIT" INC_PR = "r9" PE = "2" -DEPENDS = "expat makedepend-native flex-native bison-native libdrm expat udev" +DEPENDS = "expat makedepend-native flex-native bison-native" PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" @@ -22,21 +22,21 @@ inherit autotools pkgconfig pythonnative EXTRA_OECONF = "--enable-shared-glapi" -PACKAGECONFIG ??= "egl gles \ +PACKAGECONFIG ??= "egl gles dri \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes dri2proto" +X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[wayland] = ",,wayland" DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev" EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" -EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" EXTRA_OECONF += "--enable-gbm" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" -- cgit v1.2.3