From e89965734078663bc464a1e36ac85e2f513157d0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 Jan 2015 08:23:12 +0100 Subject: update to latest stable upstream --- package/qemu/patches/patch-pixman_Makefile_am | 8 ++++++++ package/qemu/patches/qemu-2.1.0-m68k.patch | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 package/qemu/patches/patch-pixman_Makefile_am (limited to 'package/qemu/patches') diff --git a/package/qemu/patches/patch-pixman_Makefile_am b/package/qemu/patches/patch-pixman_Makefile_am new file mode 100644 index 000000000..7f5706549 --- /dev/null +++ b/package/qemu/patches/patch-pixman_Makefile_am @@ -0,0 +1,8 @@ +--- qemu-2.2.0.orig/pixman/Makefile.am 2014-12-09 15:46:29.000000000 +0100 ++++ qemu-2.2.0/pixman/Makefile.am 2015-01-01 16:42:09.000000000 +0100 +@@ -1,4 +1,4 @@ +-SUBDIRS = pixman demos test ++SUBDIRS = pixman + + pkgconfigdir=$(libdir)/pkgconfig + pkgconfig_DATA=pixman-1.pc diff --git a/package/qemu/patches/qemu-2.1.0-m68k.patch b/package/qemu/patches/qemu-2.1.0-m68k.patch index 65b917b0a..b976c058b 100644 --- a/package/qemu/patches/qemu-2.1.0-m68k.patch +++ b/package/qemu/patches/qemu-2.1.0-m68k.patch @@ -1,6 +1,6 @@ ---- qemu-2.1.0/hw/m68k/mcf_intc.c 2014-08-01 16:12:17.000000000 +0200 -+++ qemu-2.1.0.m68k/hw/m68k/mcf_intc.c 2014-08-12 11:41:52.416975339 +0200 -@@ -65,6 +65,10 @@ +--- qemu-2.2.0.orig/hw/m68k/mcf_intc.c 2014-12-09 15:45:41.000000000 +0100 ++++ qemu-2.2.0/hw/m68k/mcf_intc.c 2014-12-31 21:02:29.000000000 +0100 +@@ -65,6 +65,10 @@ static uint64_t mcf_intc_read(void *opaq return (uint32_t)(s->ifr >> 32); case 0x14: return (uint32_t)s->ifr; @@ -11,7 +11,7 @@ case 0xe0: /* SWIACK. */ return s->active_vector; case 0xe1: case 0xe2: case 0xe3: case 0xe4: -@@ -102,6 +106,20 @@ +@@ -102,6 +106,20 @@ static void mcf_intc_write(void *opaque, case 0x0c: s->imr = (s->imr & 0xffffffff00000000ull) | (uint32_t)val; break; @@ -32,4 +32,3 @@ default: hw_error("mcf_intc_write: Bad write offset %d\n", offset); break; - -- cgit v1.2.3