summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-06-13 01:19:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 12:44:34 +0100
commit85cdc71f9def4bb9326cf440d4cad264c2b5ea6e (patch)
tree14d391fa5d375ff192ac6231cebc14a4e740acec /meta
parent6efefdf21cf31f5f195f62ca60c9f5f5b36ea449 (diff)
downloadpoky-85cdc71f9def4bb9326cf440d4cad264c2b5ea6e.tar.gz
mesa: introduce PACKAGECONFIG for dri
* move DEPENDS which were originally applied only for mesa-dri to dri PACKAGECONFIG (From OE-Core rev: f780ec28cbaade55361390a04ac70574bde426de) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc8
1 files changed, 4 insertions, 4 deletions
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"
14INC_PR = "r9" 14INC_PR = "r9"
15PE = "2" 15PE = "2"
16 16
17DEPENDS = "expat makedepend-native flex-native bison-native libdrm expat udev" 17DEPENDS = "expat makedepend-native flex-native bison-native"
18 18
19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" 19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
20 20
@@ -22,21 +22,21 @@ inherit autotools pkgconfig pythonnative
22 22
23EXTRA_OECONF = "--enable-shared-glapi" 23EXTRA_OECONF = "--enable-shared-glapi"
24 24
25PACKAGECONFIG ??= "egl gles \ 25PACKAGECONFIG ??= "egl gles dri \
26 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ 26 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
27 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ 27 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
28 " 28 "
29 29
30X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes dri2proto" 30X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
31PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" 31PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
32PACKAGECONFIG[wayland] = ",,wayland" 32PACKAGECONFIG[wayland] = ",,wayland"
33 33
34DRIDRIVERS = "swrast" 34DRIDRIVERS = "swrast"
35DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" 35DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
36DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" 36DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
37PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev"
37 38
38EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" 39EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
39EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
40EXTRA_OECONF += "--enable-gbm" 40EXTRA_OECONF += "--enable-gbm"
41 41
42PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" 42PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"