[oe-commits] Koen Kooi : mesa: move PACKAGE_ARCH = MACHINE_ARCH to the mesa-dri include
git version control
git at git.openembedded.org
Thu Jun 23 19:32:46 UTC 2011
Module: meta-openembedded.git
Branch: master
Commit: dd25d80387a90f236e7aa90939ea7cd31d9264dc
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=dd25d80387a90f236e7aa90939ea7cd31d9264dc
Author: Koen Kooi <koen at dominion.thruhere.net>
Date: Thu Jun 23 21:31:00 2011 +0200
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 at dominion.thruhere.net>
---
meta-oe/recipes-graphics/mesa/mesa-common.inc | 3 ---
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 3b255c4..29e2aca 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 0a5a576..4c5934d 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}"
More information about the Openembedded-commits
mailing list