[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: updated to 2.12.1

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f65d054fc8e
branches:  trunk
changeset: 383915:3f65d054fc8e
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Aug 14 06:57:26 2018 +0000

description:
qemu: updated to 2.12.1

2.12.1:
Bug fix release.

diffstat:

 emulators/qemu/Makefile                         |  13 ++++++-------
 emulators/qemu/distinfo                         |  11 +++++------
 emulators/qemu/options.mk                       |   4 ++--
 emulators/qemu/patches/patch-chardev_char-mux.c |  15 ---------------
 4 files changed, 13 insertions(+), 30 deletions(-)

diffs (98 lines):

diff -r d2bd660f0331 -r 3f65d054fc8e emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Tue Aug 14 06:56:39 2018 +0000
+++ b/emulators/qemu/Makefile   Tue Aug 14 06:57:26 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.186 2018/07/03 05:03:16 adam Exp $
+# $NetBSD: Makefile,v 1.187 2018/08/14 06:57:26 adam Exp $
 
-DISTNAME=      qemu-2.12.0
-PKGREVISION=   1
+DISTNAME=      qemu-2.12.1
 CATEGORIES=    emulators
 MASTER_SITES=  http://download.qemu-project.org/
 EXTRACT_SUFX=  .tar.xz
@@ -91,14 +90,14 @@
 .if ${OPSYS} == "NetBSD"
 USER_EMUL=             i386 x86_64 sparc sparc64
 PLIST.nbd=             YES
-.elif !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
+.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
 USER_EMUL=             i386 x86_64 sparc sparc64
 PLIST.nbd=             YES
-.elif !empty(OPSYS:MDarwin)
+.elif ${OPSYS} == "Darwin"
 USER_EMUL=
 CONFIGURE_ARGS+=       --disable-bsd-user
 PLIST.nbd=             YES
-.elif !empty(OPSYS:MLinux)
+.elif ${OPSYS} == "Linux"
 USER_EMUL=             ${UE_ARCHS}
 PLIST.nbd=             YES
 PLIST.ivshmem=         YES
@@ -119,7 +118,7 @@
                ${DESTDIR}${PREFIX}/share/doc/qemu/
 
 # On Darwin, qemu uses Cocoa and CoreAudio
-.if empty(OPSYS:MDarwin)
+.if ${OPSYS} != "Darwin"
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../archivers/lzo/buildlink3.mk"
diff -r d2bd660f0331 -r 3f65d054fc8e emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Tue Aug 14 06:56:39 2018 +0000
+++ b/emulators/qemu/distinfo   Tue Aug 14 06:57:26 2018 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.135 2018/04/25 07:56:05 adam Exp $
+$NetBSD: distinfo,v 1.136 2018/08/14 06:57:26 adam Exp $
 
-SHA1 (qemu-2.12.0.tar.xz) = 5a62c911b2cebbd41decd5c77c524395212411cf
-RMD160 (qemu-2.12.0.tar.xz) = 6d73b29ee562553c02711acd0dc552363c67f96e
-SHA512 (qemu-2.12.0.tar.xz) = dda057c52cf5fe460b029448049266ace061d21fb5f1cf71a6a37f67b3b7fc3350f6712bf22803fc38fa91f0bd438896ba01b5817b3b94ba9b6925aeaae053b7
-Size (qemu-2.12.0.tar.xz) = 35405044 bytes
+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 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c
 SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
 SHA1 (patch-block.c) = 5eb15a87d6646719bf1e9277fbe73a99e4905481
-SHA1 (patch-chardev_char-mux.c) = e597d4dc3889c00d001d899088c4c8cdc4e00474
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
diff -r d2bd660f0331 -r 3f65d054fc8e emulators/qemu/options.mk
--- a/emulators/qemu/options.mk Tue Aug 14 06:56:39 2018 +0000
+++ b/emulators/qemu/options.mk Tue Aug 14 06:57:26 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2017/08/30 21:00:46 kamil Exp $
+# $NetBSD: options.mk,v 1.5 2018/08/14 06:57:26 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS= gtk3 sdl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if empty(OPSYS:MDarwin)
+.if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=        sdl
 .endif
 
diff -r d2bd660f0331 -r 3f65d054fc8e emulators/qemu/patches/patch-chardev_char-mux.c
--- a/emulators/qemu/patches/patch-chardev_char-mux.c   Tue Aug 14 06:56:39 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-chardev_char-mux.c,v 1.1 2018/04/17 20:02:14 gson Exp $
-
-Fix ctrl-a b again.  This is a backport of qemu git commit
-1b2503fcf7b5932c5a3779ca2ceb92bd403c4ee7.
-
---- chardev/char-mux.c.orig    2018-02-14 21:53:22.000000000 +0000
-+++ chardev/char-mux.c
-@@ -295,6 +295,7 @@ void mux_set_focus(Chardev *chr, int foc
-     }
- 
-     d->focus = focus;
-+    chr->be = d->backends[focus];
-     mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
- }
-