diff options
| -rw-r--r-- | emulators/qemu/Makefile | 5 | ||||
| -rw-r--r-- | emulators/qemu/PLIST | 9 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 14 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-block.c | 8 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-configure | 49 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-util_oslib-posix.c | 16 |
6 files changed, 19 insertions, 82 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 70c058acf0e..448aaf247d9 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.183 2018/04/17 20:02:14 gson Exp $ +# $NetBSD: Makefile,v 1.184 2018/04/25 07:56:05 adam Exp $ -DISTNAME= qemu-2.11.1 -PKGREVISION= 3 +DISTNAME= qemu-2.12.0 CATEGORIES= emulators MASTER_SITES= http://download.qemu-project.org/ EXTRACT_SUFX= .tar.xz diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST index 74088378863..8f37dde390e 100644 --- a/emulators/qemu/PLIST +++ b/emulators/qemu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.53 2017/12/14 02:03:52 kamil Exp $ +@comment $NetBSD: PLIST,v 1.54 2018/04/25 07:56:05 adam Exp $ ${PLIST.ivshmem}bin/ivshmem-client ${PLIST.ivshmem}bin/ivshmem-server ${PLIST.alpha}bin/qemu-alpha @@ -29,6 +29,7 @@ bin/qemu-system-aarch64 bin/qemu-system-alpha bin/qemu-system-arm bin/qemu-system-cris +bin/qemu-system-hppa bin/qemu-system-i386 bin/qemu-system-lm32 bin/qemu-system-m68k @@ -44,6 +45,8 @@ bin/qemu-system-or1k bin/qemu-system-ppc bin/qemu-system-ppc64 bin/qemu-system-ppcemb +bin/qemu-system-riscv32 +bin/qemu-system-riscv64 bin/qemu-system-s390x bin/qemu-system-sh4 bin/qemu-system-sh4eb @@ -79,10 +82,10 @@ ${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo ${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo share/qemu/QEMU,cgthree.bin share/qemu/QEMU,tcx.bin -share/qemu/acpi-dsdt.aml share/qemu/bamboo.dtb share/qemu/bios-256k.bin share/qemu/bios.bin +share/qemu/canyonlands.dtb share/qemu/efi-e1000.rom share/qemu/efi-e1000e.rom share/qemu/efi-eepro100.rom @@ -91,6 +94,7 @@ share/qemu/efi-pcnet.rom share/qemu/efi-rtl8139.rom share/qemu/efi-virtio.rom share/qemu/efi-vmxnet3.rom +share/qemu/hppa-firmware.img share/qemu/keymaps/ar share/qemu/keymaps/bepo share/qemu/keymaps/common @@ -155,6 +159,7 @@ share/qemu/skiboot.lid share/qemu/slof.bin share/qemu/spapr-rtas.bin share/qemu/trace-events-all +share/qemu/u-boot-sam460-20100605.bin share/qemu/u-boot.e500 share/qemu/vgabios-cirrus.bin share/qemu/vgabios-qxl.bin diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 1643bd48a8d..868e44087db 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.134 2018/04/17 20:02:14 gson Exp $ +$NetBSD: distinfo,v 1.135 2018/04/25 07:56:05 adam Exp $ -SHA1 (qemu-2.11.1.tar.xz) = e85cfbdff264510fd9bba73d83978ab4ecee3f41 -RMD160 (qemu-2.11.1.tar.xz) = 5e713f1fb5f742536211d0e27fc377b849730b1e -SHA512 (qemu-2.11.1.tar.xz) = 7fd4a7c6fa8627510431ed34f05bdd6b055ea66207bab29904bbce66dfd5b07546f02dfcb34937f48efb67184200ab3c8501763776adc1cdc1302a924fb2a5ef -Size (qemu-2.11.1.tar.xz) = 28992188 bytes +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 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41 -SHA1 (patch-block.c) = 6f54da333696584067a7556b8cabfa8853758824 +SHA1 (patch-block.c) = 5eb15a87d6646719bf1e9277fbe73a99e4905481 SHA1 (patch-chardev_char-mux.c) = e597d4dc3889c00d001d899088c4c8cdc4e00474 -SHA1 (patch-configure) = 6d0acd72edb8c602ffbc98fdbc161bc10aa968e2 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 @@ -17,4 +16,3 @@ 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-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162 -SHA1 (patch-util_oslib-posix.c) = 319ad18de96860172c8d10920fe2c117e787403e diff --git a/emulators/qemu/patches/patch-block.c b/emulators/qemu/patches/patch-block.c index 291d6eab72e..c32359b9100 100644 --- a/emulators/qemu/patches/patch-block.c +++ b/emulators/qemu/patches/patch-block.c @@ -1,15 +1,15 @@ -$NetBSD: patch-block.c,v 1.1 2017/12/14 08:01:11 adam Exp $ +$NetBSD: patch-block.c,v 1.2 2018/04/25 07:56:05 adam Exp $ Remove block driver whitelisting logic; reasons being: - PkgSrc does not configure Qemu to use whitelisting - sometimes CONFIG...WHITELIST macros contain ["", NULL], and bdrv_is_whitelisted() fails. ---- block.c.orig 2017-12-04 12:07:17.000000000 +0000 +--- block.c.orig 2018-03-27 22:29:23.000000000 +0000 +++ block.c -@@ -369,31 +369,7 @@ BlockDriver *bdrv_find_format(const char +@@ -373,31 +373,7 @@ BlockDriver *bdrv_find_format(const char - static int bdrv_is_whitelisted(BlockDriver *drv, bool read_only) + int bdrv_is_whitelisted(BlockDriver *drv, bool read_only) { - static const char *whitelist_rw[] = { - CONFIG_BDRV_RW_WHITELIST diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure deleted file mode 100644 index be4dae0b297..00000000000 --- a/emulators/qemu/patches/patch-configure +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-configure,v 1.22 2018/01/04 16:48:17 gson Exp $ - -Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least). - -Check for posix_memalign in configure script instead of incorrectly -testing _POSIX_C_SOURCE in util/oslib-posix.c - ---- configure.orig 2017-12-29 22:10:50.000000000 +0000 -+++ configure -@@ -4542,6 +4542,21 @@ if compile_prog "" "" ; then - fi - - ########################################## -+# check if we have posix_memalign() -+ -+posix_memalign=no -+cat > $TMPC << EOF -+#include <stdlib.h> -+int main(void) { -+ void *p; -+ return posix_memalign(&p, 8, 8); -+} -+EOF -+if compile_prog "" "" ; then -+ posix_memalign=yes -+fi -+ -+########################################## - # check if we have posix_syslog - - posix_syslog=no -@@ -5509,6 +5524,7 @@ echo "preadv support $preadv" - echo "fdatasync $fdatasync" - echo "madvise $madvise" - echo "posix_madvise $posix_madvise" -+echo "posix_memalign $posix_memalign" - echo "libcap-ng support $cap_ng" - echo "vhost-net support $vhost_net" - echo "vhost-scsi support $vhost_scsi" -@@ -5982,6 +5998,9 @@ fi - if test "$posix_madvise" = "yes" ; then - echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak - fi -+if test "$posix_memalign" = "yes" ; then -+ echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak -+fi - - if test "$spice" = "yes" ; then - echo "CONFIG_SPICE=y" >> $config_host_mak diff --git a/emulators/qemu/patches/patch-util_oslib-posix.c b/emulators/qemu/patches/patch-util_oslib-posix.c deleted file mode 100644 index cd00da5e016..00000000000 --- a/emulators/qemu/patches/patch-util_oslib-posix.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-util_oslib-posix.c,v 1.1 2018/01/04 16:48:17 gson Exp $ - -Check for posix_memalign in configure script instead of incorrectly -testing _POSIX_C_SOURCE in util/oslib-posix.c - ---- util/oslib-posix.c.orig 2017-12-13 17:27:20.000000000 +0000 -+++ util/oslib-posix.c -@@ -105,7 +105,7 @@ void *qemu_try_memalign(size_t alignment - alignment = sizeof(void*); - } - --#if defined(_POSIX_C_SOURCE) && !defined(__sun__) -+#if defined(CONFIG_POSIX_MEMALIGN) - int ret; - ret = posix_memalign(&ptr, alignment, size); - if (ret != 0) { |