diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/Makefile | 8 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 13 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-hw_usb_dev-mtp.c | 6 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-slirp_tcp__subr.c | 13 |
4 files changed, 13 insertions, 27 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index e929c2ff936..7800f9148d8 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.187 2018/08/14 06:57:26 adam Exp $ +# $NetBSD: Makefile,v 1.188 2018/08/16 10:15:09 adam Exp $ -DISTNAME= qemu-2.12.1 +DISTNAME= qemu-3.0.0 CATEGORIES= emulators MASTER_SITES= http://download.qemu-project.org/ EXTRACT_SUFX= .tar.xz @@ -107,8 +107,8 @@ CONFIGURE_ARGS+= --disable-coroutine-pool .endif PLIST_VARS+= ${UE_ARCHS} nbd ivshmem -.for _var_ in ${USER_EMUL} -PLIST.${_var_}= YES +.for pvar in ${USER_EMUL} +PLIST.${pvar}= YES .endfor TEST_TARGET= check diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 450147b9011..c5bdff65887 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.136 2018/08/14 06:57:26 adam Exp $ +$NetBSD: distinfo,v 1.137 2018/08/16 10:15:09 adam Exp $ -SHA1 (qemu-2.12.1.tar.xz) = 10c2730bb48b1ab4f4d568c3ea2c12a8c35f5106 -RMD160 (qemu-2.12.1.tar.xz) = a50f3be6220da88ce4a67fc3bf717ea788231d81 -SHA512 (qemu-2.12.1.tar.xz) = e05c2bcd06640322452e64e26e4964b3bc9419645de8356f4e83484e37968a0b47dc8377c8c6641941973b247cb0dc22c7dad302d039baa194b1864f2c6ad7e4 -Size (qemu-2.12.1.tar.xz) = 35416404 bytes +SHA1 (qemu-3.0.0.tar.xz) = fffb4aa0139c7290295a129e040cec0df4468ea6 +RMD160 (qemu-3.0.0.tar.xz) = ea61cb8b6b144c7017c3a53161f883c3aeb15611 +SHA512 (qemu-3.0.0.tar.xz) = a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a +Size (qemu-3.0.0.tar.xz) = 35624516 bytes SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41 SHA1 (patch-block.c) = 5eb15a87d6646719bf1e9277fbe73a99e4905481 @@ -12,6 +12,5 @@ SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 -SHA1 (patch-hw_usb_dev-mtp.c) = f5a446079d51b19eae6c2f5e0c9810c181e4f02d -SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154 +SHA1 (patch-hw_usb_dev-mtp.c) = 66543b5559d92f8e2fa9a6eb85e5dfe7c1ad3339 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162 diff --git a/emulators/qemu/patches/patch-hw_usb_dev-mtp.c b/emulators/qemu/patches/patch-hw_usb_dev-mtp.c index c6f266b6d78..6358e81a2ba 100644 --- a/emulators/qemu/patches/patch-hw_usb_dev-mtp.c +++ b/emulators/qemu/patches/patch-hw_usb_dev-mtp.c @@ -1,12 +1,12 @@ -$NetBSD: patch-hw_usb_dev-mtp.c,v 1.1 2017/08/25 12:39:56 jperkin Exp $ +$NetBSD: patch-hw_usb_dev-mtp.c,v 1.2 2018/08/16 10:15:09 adam Exp $ Support NAME_MAX. ---- hw/usb/dev-mtp.c.orig 2017-04-20 14:57:00.000000000 +0000 +--- hw/usb/dev-mtp.c.orig 2018-08-14 19:10:34.000000000 +0000 +++ hw/usb/dev-mtp.c @@ -26,6 +26,10 @@ #include "hw/usb.h" - #include "hw/usb/desc.h" + #include "desc.h" +#ifndef NAME_MAX +#define NAME_MAX 255 diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c deleted file mode 100644 index 10d714fc161..00000000000 --- a/emulators/qemu/patches/patch-slirp_tcp__subr.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-slirp_tcp__subr.c,v 1.7 2016/05/15 01:25:15 ryoon Exp $ - ---- slirp/tcp_subr.c.orig 2016-05-11 15:56:13.000000000 +0000 -+++ slirp/tcp_subr.c -@@ -407,6 +407,8 @@ int tcp_fconnect(struct socket *so, unsi - socket_set_fast_reuse(s); - opt = 1; - qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt)); -+ opt = 1; -+ qemu_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)); - - addr = so->fhost.ss; - DEBUG_CALL(" connect()ing") |