summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-07-01 21:36:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:26:21 +0100
commit0b1e64a8d026a8021f4568758a637689e886037b (patch)
treed8229480ea60ec5b1306c814cef7d2acd790b6b0
parent41053141cdc04fd6d8490b54b8b8dc59dc0fe93a (diff)
downloadopenembedded-core-0b1e64a8d026a8021f4568758a637689e886037b.tar.gz
openembedded-core-0b1e64a8d026a8021f4568758a637689e886037b.tar.bz2
openembedded-core-0b1e64a8d026a8021f4568758a637689e886037b.zip
mesa: Improve gallium PACKAGECONFIG options
* rename llvmpipe to llvm to match configure option * add MESA_LLVM_RELEASE to allow switching to 3.3 easier * --enable-gallium isn't recognized option, split it to 2 more PACKAGECONFIGs for gbm and egl Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 01dbbade32..599ec7e2c2 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -49,10 +49,13 @@ PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disa
PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
GALLIUMDRIVERS = "swrast"
-PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers"
-
-export WANT_LLVM_RELEASE = "3.2"
-PACKAGECONFIG[gallium-llvmpipe] = "--enable-gallium-llvm --enable-gallium-egl --enable-gallium-gbm --with-llvm-shared-libs --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers, llvm3.2"
+# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
+PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
+PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl"
+PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm"
+MESA_LLVM_RELEASE ?= "3.2"
+PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE}"
+export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"