diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-23 21:31:00 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-23 21:31:00 +0200 |
| commit | dd25d80387a90f236e7aa90939ea7cd31d9264dc (patch) | |
| tree | 821d4dc0ccecbefbe4b88a352210c8eabd0010dd /meta-oe/recipes-graphics/mesa | |
| parent | 7bb0dfc5cdab0c4b605a7f0feaadd55a06044e61 (diff) | |
| download | meta-openembedded-contrib-dd25d80387a90f236e7aa90939ea7cd31d9264dc.tar.gz | |
mesa: move PACKAGE_ARCH = MACHINE_ARCH to the mesa-dri include
mesa-dri is the only machine specific one, leaking MACHINE_ARCH into mesa-x11 causes massive sstate mismatch
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics/mesa')
| -rw-r--r-- | meta-oe/recipes-graphics/mesa/mesa-common.inc | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/mesa/mesa-dri.inc | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc index 3b255c4696..29e2acabf9 100644 --- a/meta-oe/recipes-graphics/mesa/mesa-common.inc +++ b/meta-oe/recipes-graphics/mesa/mesa-common.inc @@ -28,9 +28,6 @@ EXTRA_OECONF = "--enable-glu \ inherit glx-use-tls -# Package contents vary according to ${MACHINE_DRI_MODULES}. -PACKAGE_ARCH = "${MACHINE_ARCH}" - PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" FILES_${PN} += "${libdir}/dri/*.so" FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri.inc b/meta-oe/recipes-graphics/mesa/mesa-dri.inc index 0a5a576e93..4c5934da13 100644 --- a/meta-oe/recipes-graphics/mesa/mesa-dri.inc +++ b/meta-oe/recipes-graphics/mesa/mesa-dri.inc @@ -7,4 +7,5 @@ FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" +PACKAGE_ARCH = "${MACHINE_ARCH}" EXTRA_OECONF += " --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" |