CVS commit: pkgsrc/emulators/qemu

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Thu Dec 14 02:03:53 UTC 2017

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/patches: patch-configure
Added Files:
        pkgsrc/emulators/qemu/patches: patch-Makefile
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-et patch-hw_net_e1000.c
            patch-hw_net_e1000__regs.h patch-hw_net_e1000e__core.c
            patch-hw_net_e1000x__common.h patch-hw_ppc_mac__newworld.c
            patch-hw_ppc_mac__oldworld.c patch-memory.c

Log Message:
qemu: Upgrade to 2.11.0

pkgsrc changes
==============

Remove merged patches, mostly for SmartOS. There are more to go and there
is a call for volunteers to step in as a maintainer and help to upstream the
remaining ones.

SmartOS as host support is scheduled to be removed in the next major version
of qemu.

upstream changes
================

The full list of changes are available at:

  https://wiki.qemu.org/ChangeLog/2.11

Highlights include:

 * Improved support for running Hyper-V on top of KVM
 * New hotpluggable PCIe-to-PCI bridge device with SHPC support
 * Experimental GPUDirect support for Nvidia passthrough devices (p2p DMA)
 * Better performance using integrated LUKS support for block devices
 * Added a qemu-block-drivers man page
 * TPM emulation support
 * Ability to hotplug a watchdog device and specify watchdog actions at
   runtime
 * UI: improved client support for VNC via websockets
 * UI: better keymap support for SDL/GTK/Cocoa front-ends and various input
   devices

 * ARM: support for Smartfusion2 board
 * ARM: improved performance for PCI passthrough devices using INTx
 * ARM: improved XEN support for AArch64 guests
 * OpenRISC: experimental support for SMP
 * PowerPC: fixes for Mac machine types
 * PowerPC: pseries: support for virtual SMT modes in guests
 * s390: support for virtio-input-ccw and virtio-gpu-ccw
 * s390: support for CPU hotplug via newer device_add interface
 * s390: experimental support for multiple vcpu threads under full emulation
 * SPARC: sun4u: support for sunhme (Happy Meal Ethernet) NIC
 * SPARC: sun4u: use of Simba PCI bridges to better match Ultra 5 PCI
   topology

 * and lots more...


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.129 -r1.130 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/qemu/patches/patch-Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/qemu/patches/patch-configure
cvs rdiff -u -r1.14 -r0 pkgsrc/emulators/qemu/patches/patch-et
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/qemu/patches/patch-hw_net_e1000.c \
    pkgsrc/emulators/qemu/patches/patch-hw_net_e1000__regs.h \
    pkgsrc/emulators/qemu/patches/patch-hw_net_e1000e__core.c \
    pkgsrc/emulators/qemu/patches/patch-hw_net_e1000x__common.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c \
    pkgsrc/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
cvs rdiff -u -r1.11 -r0 pkgsrc/emulators/qemu/patches/patch-memory.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.175 pkgsrc/emulators/qemu/Makefile:1.176
--- pkgsrc/emulators/qemu/Makefile:1.175        Thu Nov 23 17:19:53 2017
+++ pkgsrc/emulators/qemu/Makefile      Thu Dec 14 02:03:52 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.175 2017/11/23 17:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.176 2017/12/14 02:03:52 kamil Exp $
 
-DISTNAME=      qemu-2.10.1
-PKGREVISION=   2
+DISTNAME=      qemu-2.11.0
 CATEGORIES=    emulators
 MASTER_SITES=  http://download.qemu-project.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.52 pkgsrc/emulators/qemu/PLIST:1.53
--- pkgsrc/emulators/qemu/PLIST:1.52    Wed Oct 11 19:53:23 2017
+++ pkgsrc/emulators/qemu/PLIST Thu Dec 14 02:03:52 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2017/10/11 19:53:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.53 2017/12/14 02:03:52 kamil Exp $
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
 ${PLIST.alpha}bin/qemu-alpha
@@ -58,6 +58,7 @@ ${PLIST.unicore32}bin/qemu-unicore32
 ${PLIST.x86_64}bin/qemu-x86_64
 man/man1/qemu-img.1
 man/man1/qemu.1
+man/man7/qemu-block-drivers.7
 man/man7/qemu-ga-ref.7
 man/man7/qemu-qmp-ref.7
 man/man8/qemu-ga.8

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.129 pkgsrc/emulators/qemu/distinfo:1.130
--- pkgsrc/emulators/qemu/distinfo:1.129        Wed Oct 11 19:53:23 2017
+++ pkgsrc/emulators/qemu/distinfo      Thu Dec 14 02:03:52 2017
@@ -1,24 +1,17 @@
-$NetBSD: distinfo,v 1.129 2017/10/11 19:53:23 adam Exp $
+$NetBSD: distinfo,v 1.130 2017/12/14 02:03:52 kamil Exp $
 
-SHA1 (qemu-2.10.1.tar.xz) = 7d404902de032c14ba65d2daef030cb94d65980c
-RMD160 (qemu-2.10.1.tar.xz) = dc97c919686fea43e3cb3a13edab5dcbf5c2eb2d
-SHA512 (qemu-2.10.1.tar.xz) = 62e9717ede71a49f3ffd9b86c321470f64c90e575be1a9da01078cfc9466b0aeb08adf5d05bab7ee1e89dfce75def7b276af01f77b7151d406999e7af21b6711
-Size (qemu-2.10.1.tar.xz) = 24979688 bytes
-SHA1 (patch-configure) = 51d5396f99ef129631138bc51f47bc24775aa08b
+SHA1 (qemu-2.11.0.tar.xz) = 458f3382fe5028faa89174a7321d21a0a8058b63
+RMD160 (qemu-2.11.0.tar.xz) = 3e9094d77312ae762dae216d453871d26cfc7e3a
+SHA512 (qemu-2.11.0.tar.xz) = 902cb11bcfde03a139efb8e5af978364d4160c9943142b1b3f92045066bf004aad7733ddb4d033aab40559cb00a79c907e0ffecf546e4a1a3659c19ec463940e
+Size (qemu-2.11.0.tar.xz) = 28984736 bytes
+SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c
+SHA1 (patch-configure) = 179486600f69c2678bd8ffc62626d919e4688386
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
 SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
-SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
-SHA1 (patch-hw_net_e1000.c) = 761e9afb5c74a03ee6cf0b918dd27122777a27b7
-SHA1 (patch-hw_net_e1000__regs.h) = b93974c75bec94cbba048c0b61917177c5cc08c1
-SHA1 (patch-hw_net_e1000e__core.c) = 55917bcb9ca0f80476159e51f4240e8c1df68132
-SHA1 (patch-hw_net_e1000x__common.h) = 093501bafdaa3a4b4ae705c45ea656a602907d18
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
-SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
 SHA1 (patch-hw_usb_dev-mtp.c) = f5a446079d51b19eae6c2f5e0c9810c181e4f02d
-SHA1 (patch-memory.c) = f8a97fa2ee2afcd361deaa1f0023b83d059e100b
 SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162

Index: pkgsrc/emulators/qemu/patches/patch-configure
diff -u pkgsrc/emulators/qemu/patches/patch-configure:1.20 pkgsrc/emulators/qemu/patches/patch-configure:1.21
--- pkgsrc/emulators/qemu/patches/patch-configure:1.20  Wed Aug 30 21:07:10 2017
+++ pkgsrc/emulators/qemu/patches/patch-configure       Thu Dec 14 02:03:53 2017
@@ -1,19 +1,10 @@
-$NetBSD: patch-configure,v 1.20 2017/08/30 21:07:10 kamil Exp $
+$NetBSD: patch-configure,v 1.21 2017/12/14 02:03:53 kamil Exp $
 
-Don't use gld on SunOS
 Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least).
 
---- configure.orig     2017-08-30 16:50:40.000000000 +0000
+--- configure.orig     2017-12-13 17:27:20.000000000 +0000
 +++ configure
-@@ -747,7 +747,6 @@ SunOS)
-   solaris="yes"
-   make="${MAKE-gmake}"
-   install="${INSTALL-ginstall}"
--  ld="gld"
-   smbd="${SMBD-/usr/sfw/sbin/smbd}"
-   if test -f /usr/include/sys/soundcard.h ; then
-     audio_drv_list="oss"
-@@ -3117,12 +3116,13 @@ if test "$curses" != "no" ; then
+@@ -3165,12 +3165,13 @@ if test "$curses" != "no" ; then
      curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
      curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
    else

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-Makefile
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-Makefile:1.1
--- /dev/null   Thu Dec 14 02:03:53 2017
+++ pkgsrc/emulators/qemu/patches/patch-Makefile        Thu Dec 14 02:03:53 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile,v 1.1 2017/12/14 02:03:53 kamil Exp $
+
+--- Makefile.orig      2017-12-13 17:27:20.000000000 +0000
++++ Makefile
+@@ -385,6 +385,7 @@ subdir-%:
+ DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
+ DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
+ DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
++ARFLAGS=      -rcs
+ 
+ subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests
+       $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) 
libfdt/libfdt.a,)