diff options
author | Jeff Dike <jdike@linux.intel.com> | 2010-05-27 13:16:59 -0400 |
---|---|---|
committer | Jeff Dike <jdike@linux.intel.com> | 2010-05-27 13:16:59 -0400 |
commit | 4de4707213f62b1e49191a1b7f26c6d419da4608 (patch) | |
tree | d109b8d9e3034bc6014bdbbec11a14dd3037737a /meta/packages/qemu | |
parent | 1de1ac2eb21ccb393507f6c950d8254e601c16b9 (diff) | |
download | poky-4de4707213f62b1e49191a1b7f26c6d419da4608.tar.gz |
qemu: updated the glflags patch, which is needed by qemusdk.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r-- | meta/packages/qemu/qemu-git/glflags.patch | 16 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_git.bb | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/qemu/qemu-git/glflags.patch b/meta/packages/qemu/qemu-git/glflags.patch index fadca25a20..0a27c2dee1 100644 --- a/meta/packages/qemu/qemu-git/glflags.patch +++ b/meta/packages/qemu/qemu-git/glflags.patch | |||
@@ -1,13 +1,13 @@ | |||
1 | Index: git/Makefile.target | 1 | Index: git/Makefile.target |
2 | =================================================================== | 2 | =================================================================== |
3 | --- git.orig/Makefile.target 2009-09-17 11:36:06.000000000 +0100 | 3 | --- git.orig/Makefile.target 2010-05-27 12:35:26.000000000 -0400 |
4 | +++ git/Makefile.target 2009-09-17 11:36:12.000000000 +0100 | 4 | +++ git/Makefile.target 2010-05-27 12:59:53.520415731 -0400 |
5 | @@ -748,7 +748,7 @@ | 5 | @@ -326,7 +326,7 @@ vl.o: qemu-options.h |
6 | $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) | ||
7 | 6 | ||
8 | $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a | 7 | monitor.o: qemu-monitor.h |
9 | - $(LINK) -lGL -lGLU | ||
10 | + $(LINK) -lGL | ||
11 | 8 | ||
12 | endif # !CONFIG_USER_ONLY | 9 | -LIBS += -lGL -lGLU |
10 | +LIBS += -lGL | ||
11 | |||
12 | ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) | ||
13 | 13 | ||
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb index 0bba600038..dc5db97308 100644 --- a/meta/packages/qemu/qemu_git.bb +++ b/meta/packages/qemu/qemu_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | LICENSE = "GPL" | 1 | LICENSE = "GPL" |
2 | DEPENDS = "zlib" | 2 | DEPENDS = "zlib" |
3 | PV = "0.12.0+git${SRCREV}" | 3 | PV = "0.12.0+git${SRCREV}" |
4 | PR = "r4" | 4 | PR = "r5" |
5 | 5 | ||
6 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" | 6 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" |
7 | 7 | ||