diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2012-05-29 16:30:33 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 12:04:48 +0100 |
| commit | d63298e566324cf4cc4fa457348fdce56615ecf6 (patch) | |
| tree | f30baf14775837eb2d2c3113c3fc5d9793fa1de7 /meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch | |
| parent | 7a619c235f17a2e55b25d7e12984bfb61ec964fb (diff) | |
| download | poky-d63298e566324cf4cc4fa457348fdce56615ecf6.tar.gz | |
qemu: Add an option to remove host sdl/gl checking
Add an PACKAGECONFIG in qemu to disable GL acceleration:
* By default configure try best to enable GL acceleration and fail when missing
host dependency(libSDL and libGL).
* End user can also choose to turn off GL capability, thus remove the host
dependence in building.
[YOCTO #2407] got fixed.
(From OE-Core rev: cfa93553e17057a1ea9d81e3a415fc8260c54067)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch index 0ad5551d47..638d2622b6 100644 --- a/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch +++ b/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch | |||
| @@ -1,15 +1,33 @@ | |||
| 1 | Considering relocation, qemu-nativesdk is independent of host library except | ||
| 2 | libGL. Normal method like 'cat > $TMPC' doesn't work, so we check the library | ||
| 3 | directly. | ||
| 4 | |||
| 1 | Upstream-Status: Inappropriate [configuration] | 5 | Upstream-Status: Inappropriate [configuration] |
| 2 | 6 | ||
| 3 | Index: qemu-0.14.0/Makefile.target | 7 | Index: qemu-0.15.1/configure |
| 4 | =================================================================== | 8 | =================================================================== |
| 5 | --- qemu-0.14.0.orig/Makefile.target 2011-04-04 12:12:19.142871742 +0100 | 9 | --- qemu-0.15.1.orig/configure 2012-05-25 18:26:05.000000000 +0800 |
| 6 | +++ qemu-0.14.0/Makefile.target 2011-04-04 12:12:21.772871742 +0100 | 10 | +++ qemu-0.15.1/configure 2012-05-29 09:43:27.000000000 +0800 |
| 7 | @@ -362,7 +362,7 @@ | 11 | @@ -2032,15 +2032,13 @@ |
| 8 | 12 | exit 1; | |
| 9 | monitor.o: hmp-commands.h qmp-commands.h | 13 | fi |
| 10 | |||
| 11 | -LIBS += -lGL -lGLU | ||
| 12 | +LIBS += -lGL | ||
| 13 | |||
| 14 | $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) | ||
| 15 | 14 | ||
| 15 | - gl_accel_libs="-lGL -lGLU" | ||
| 16 | - cat > $TMPC << EOF | ||
| 17 | -#include <X11/Xlib.h> | ||
| 18 | -#include <GL/gl.h> | ||
| 19 | -#include <GL/glx.h> | ||
| 20 | -#include <GL/glu.h> | ||
| 21 | -int main(void) { GL_VERSION; return 0; } | ||
| 22 | -EOF | ||
| 23 | - if compile_prog "" "-lGL -lGLU" ; then | ||
| 24 | + gl_accel_libs="-lGL" | ||
| 25 | + libgl='no' | ||
| 26 | + test -e /usr/lib/libGL.so && libgl='yes' | ||
| 27 | + test -e /usr/lib64/libGL.so && libgl='yes' | ||
| 28 | + test -e /usr/lib/*-linux-gnu/libGL.so && libgl='yes' | ||
| 29 | + | ||
| 30 | + if test "$libgl" = "yes" ; then | ||
| 31 | gl_accel=yes | ||
| 32 | libs_softmmu="$gl_accel_libs $libs_softmmu" | ||
| 33 | else | ||