diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2010-08-09 11:46:39 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2010-08-09 11:46:39 +0000 |
| commit | 6e3fe8ed149feb0f498094ae29b32ecfc2d00bdf (patch) | |
| tree | 7d0544eb4b2483fe195c6e2137c744dd13d1c838 /emulators/qemu | |
| parent | 0d2113fae4b3b46c92146380044bb3cac59f20e5 (diff) | |
| download | pkgsrc-6e3fe8ed149feb0f498094ae29b32ecfc2d00bdf.tar.gz | |
Suppress (harmless) warnings caused by pkgsrc patches.
Diffstat (limited to 'emulators/qemu')
| -rw-r--r-- | emulators/qemu/distinfo | 6 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-aa | 15 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-ba | 9 |
3 files changed, 16 insertions, 14 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index fca21111677..c614aa98664 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.55 2010/05/17 14:31:07 tsutsui Exp $ +$NetBSD: distinfo,v 1.56 2010/08/09 11:46:39 tsutsui Exp $ SHA1 (qemu-0.12.4.tar.gz) = 1cc3200bf496c836f7c4256c1d12143dab9b82dc RMD160 (qemu-0.12.4.tar.gz) = dbf5e02812b0df076e4ec8c20b7c382f7507645e Size (qemu-0.12.4.tar.gz) = 4697077 bytes -SHA1 (patch-aa) = 7180def64ebff88074666adef21ee1b5022b6881 +SHA1 (patch-aa) = df7561fa16c1b12b973557a6e9a13e82bc64df89 SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569 -SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc +SHA1 (patch-ba) = f317a580e849aa368f904137d4fb7ce44701a231 SHA1 (patch-dd) = 32661203ba023bea67cd7cde1f4088f4d0e5c582 SHA1 (patch-de) = 225eaa996fccc02b17be0099d943c75302600ada SHA1 (patch-dk) = 5538bebc08b0047e501469f9cb306cb798d0eb00 diff --git a/emulators/qemu/patches/patch-aa b/emulators/qemu/patches/patch-aa index fa1a91eceb4..dcfa9a3e978 100644 --- a/emulators/qemu/patches/patch-aa +++ b/emulators/qemu/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.6 2010/02/27 23:21:13 tnn Exp $ +$NetBSD: patch-aa,v 1.7 2010/08/09 11:46:39 tsutsui Exp $ ---- net/tap-bsd.c.orig 2010-02-23 20:54:38.000000000 +0000 +--- net/tap-bsd.c.orig 2010-05-04 15:27:48.000000000 +0000 +++ net/tap-bsd.c @@ -27,6 +27,8 @@ #include "sysemu.h" @@ -11,17 +11,20 @@ $NetBSD: patch-aa,v 1.6 2010/02/27 23:21:13 tnn Exp $ #include <net/if_tap.h> #endif -@@ -45,6 +47,9 @@ int tap_open(char *ifname, int ifname_si +@@ -43,8 +45,12 @@ + int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required) + { int fd; - char *dev; - struct stat s; +#ifdef TAPGIFNAME + struct ifreq ifr; ++#else + char *dev; + struct stat s; +#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* if no ifname is given, always start the search from tap0. */ -@@ -75,14 +80,26 @@ int tap_open(char *ifname, int ifname_si +@@ -75,14 +81,26 @@ int tap_open(char *ifname, int ifname_si #else TFR(fd = open("/dev/tap", O_RDWR)); if (fd < 0) { diff --git a/emulators/qemu/patches/patch-ba b/emulators/qemu/patches/patch-ba index 4eb631522be..565569c41f0 100644 --- a/emulators/qemu/patches/patch-ba +++ b/emulators/qemu/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.1 2007/12/24 10:18:22 apb Exp $ +$NetBSD: patch-ba,v 1.2 2010/08/09 11:46:39 tsutsui Exp $ ---- hw/pcspk.c.orig 2007-02-06 01:01:54.000000000 +0200 +--- hw/pcspk.c.orig 2010-05-04 15:27:48.000000000 +0000 +++ hw/pcspk.c -@@ -38,7 +38,6 @@ typedef struct { +@@ -42,7 +42,6 @@ typedef struct { unsigned int samples; unsigned int play_pos; int data_on; @@ -10,7 +10,7 @@ $NetBSD: patch-ba,v 1.1 2007/12/24 10:18:22 apb Exp $ } PCSpkState; static const char *s_spk = "pcspk"; -@@ -112,15 +111,32 @@ int pcspk_audio_init(AudioState *audio) +@@ -112,15 +111,31 @@ int pcspk_audio_init(qemu_irq *pic) return 0; } @@ -34,7 +34,6 @@ $NetBSD: patch-ba,v 1.1 2007/12/24 10:18:22 apb Exp $ { PCSpkState *s = opaque; int out; -+ int dummy_refresh_clock; - s->dummy_refresh_clock ^= (1 << 4); out = pit_get_out(s->pit, 2, qemu_get_clock(vm_clock)) << 5; |