CVS commit: pkgsrc/emulators/qemu

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 14 06:57:26 UTC 2018

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo options.mk
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-chardev_char-mux.c

Log Message:
qemu: updated to 2.12.1

2.12.1:
Bug fix release.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/qemu/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.186 pkgsrc/emulators/qemu/Makefile:1.187
--- pkgsrc/emulators/qemu/Makefile:1.186        Tue Jul  3 05:03:16 2018
+++ pkgsrc/emulators/qemu/Makefile      Tue Aug 14 06:57:26 2018
@@ -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 @@ UE_ARCHS+=          sparc64 x86_64 microblazeel 
 .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 @@ post-install:
                ${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"

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.135 pkgsrc/emulators/qemu/distinfo:1.136
--- pkgsrc/emulators/qemu/distinfo:1.135        Wed Apr 25 07:56:05 2018
+++ pkgsrc/emulators/qemu/distinfo      Tue Aug 14 06:57:26 2018
@@ -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

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.4 pkgsrc/emulators/qemu/options.mk:1.5
--- pkgsrc/emulators/qemu/options.mk:1.4        Wed Aug 30 21:00:46 2017
+++ pkgsrc/emulators/qemu/options.mk    Tue Aug 14 06:57:26 2018
@@ -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