summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorJeff Dike <jdike@linux.intel.com>2010-05-27 13:16:59 -0400
committerJeff Dike <jdike@linux.intel.com>2010-05-27 13:16:59 -0400
commit4de4707213f62b1e49191a1b7f26c6d419da4608 (patch)
treed109b8d9e3034bc6014bdbbec11a14dd3037737a /meta/packages
parent1de1ac2eb21ccb393507f6c950d8254e601c16b9 (diff)
downloadopenembedded-core-4de4707213f62b1e49191a1b7f26c6d419da4608.tar.gz
openembedded-core-4de4707213f62b1e49191a1b7f26c6d419da4608.tar.bz2
openembedded-core-4de4707213f62b1e49191a1b7f26c6d419da4608.tar.xz
openembedded-core-4de4707213f62b1e49191a1b7f26c6d419da4608.zip
qemu: updated the glflags patch, which is needed by qemusdk.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/qemu/qemu-git/glflags.patch16
-rw-r--r--meta/packages/qemu/qemu_git.bb2
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 fadca25a2..0a27c2dee 100644
--- a/meta/packages/qemu/qemu-git/glflags.patch
+++ b/meta/packages/qemu/qemu-git/glflags.patch
@@ -1,13 +1,13 @@
Index: git/Makefile.target
===================================================================
---- git.orig/Makefile.target 2009-09-17 11:36:06.000000000 +0100
-+++ git/Makefile.target 2009-09-17 11:36:12.000000000 +0100
-@@ -748,7 +748,7 @@
- $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
+--- git.orig/Makefile.target 2010-05-27 12:35:26.000000000 -0400
++++ git/Makefile.target 2010-05-27 12:59:53.520415731 -0400
+@@ -326,7 +326,7 @@ vl.o: qemu-options.h
- $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
-- $(LINK) -lGL -lGLU
-+ $(LINK) -lGL
+ monitor.o: qemu-monitor.h
- endif # !CONFIG_USER_ONLY
+-LIBS += -lGL -lGLU
++LIBS += -lGL
+
+ ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index 0bba60003..dc5db9730 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,7 +1,7 @@
LICENSE = "GPL"
DEPENDS = "zlib"
PV = "0.12.0+git${SRCREV}"
-PR = "r4"
+PR = "r5"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"