On Sun, Apr 06, 2014 at 05:38:35PM -0400, Brad Smith wrote: > To anyone that wants to try out QEMU 2.0.0-rc1 before the final release to > provide > any feedback..
and rc2.. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.115 diff -u -p -u -p -r1.115 Makefile --- Makefile 26 Mar 2014 14:14:47 -0000 1.115 +++ Makefile 9 Apr 2014 00:46:44 -0000 @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.7.1 +DISTNAME= qemu-2.0.0-rc2 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,8 @@ WANTLIB= GL SDL X11 Xcomposite Xcursor X Xrandr Xrender atk-1.0 c cairo curl fdt fontconfig freetype \ gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0 \ gthread-2.0 gtk-x11-2.0 jpeg m ncurses pango-1.0 pangocairo-1.0 \ - pangoft2-1.0 pixman-1 png pthread pthread-stubs ssh2 util vte z + pangoft2-1.0 pixman-1 png pthread pthread-stubs ssh2 stdc++ util \ + vte z MODULES= devel/gettext \ lang/python Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.34 diff -u -p -u -p -r1.34 distinfo --- distinfo 26 Mar 2014 14:14:47 -0000 1.34 +++ distinfo 9 Apr 2014 00:47:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.7.1.tar.bz2) = 1olCoAQiLuuuXRVs7vswj6vZjtsoLR3eSeyBC78BvvQ= -SIZE (qemu-1.7.1.tar.bz2) = 12246206 +SHA256 (qemu-2.0.0-rc2.tar.bz2) = AgpDS2n265UijBgM/O+WShpZU3kvP/d2KGHUMMZ86Sk= +SIZE (qemu-2.0.0-rc2.tar.bz2) = 12836501 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.40 diff -u -p -u -p -r1.40 patch-configure --- patches/patch-configure 26 Mar 2014 14:14:47 -0000 1.40 +++ patches/patch-configure 4 Apr 2014 03:58:56 -0000 @@ -1,20 +1,7 @@ $OpenBSD: patch-configure,v 1.40 2014/03/26 14:14:47 brad Exp $ ---- configure.orig Tue Mar 25 10:01:10 2014 -+++ configure Tue Mar 25 17:44:02 2014 -@@ -1290,9 +1290,9 @@ for flag in $gcc_flags; do - fi - done - --if compile_prog "-Werror -fstack-protector-all" "" ; then -- QEMU_CFLAGS="$QEMU_CFLAGS -fstack-protector-all" -- LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,-fstack-protector-all" -+if compile_prog "-Werror -fstack-protector-strong" "" ; then -+ QEMU_CFLAGS="$QEMU_CFLAGS -fstack-protector-strong" -+ LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,-fstack-protector-strong" - fi - - # Workaround for http://gcc.gnu.org/PR55489. Happens with -fPIE/-fPIC and -@@ -3554,8 +3554,6 @@ fi +--- configure.orig Thu Apr 3 14:56:23 2014 ++++ configure Thu Apr 3 23:58:47 2014 +@@ -3907,8 +3907,6 @@ fi if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" @@ -22,4 +9,4 @@ $OpenBSD: patch-configure,v 1.40 2014/03 - CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" fi - + ########################################## Index: patches/patch-util_cache-utils_c =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-util_cache-utils_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-util_cache-utils_c --- patches/patch-util_cache-utils_c 20 Mar 2013 00:46:01 -0000 1.1 +++ patches/patch-util_cache-utils_c 26 Mar 2014 16:53:28 -0000 @@ -1,22 +1,16 @@ $OpenBSD: patch-util_cache-utils_c,v 1.1 2013/03/20 00:46:01 brad Exp $ ---- util/cache-utils.c.orig Sat Feb 2 07:47:18 2013 -+++ util/cache-utils.c Sat Feb 2 07:49:46 2013 -@@ -55,9 +55,16 @@ static void ppc_init_cacheline_sizes(void) - qemu_cache_conf.icache_bsize = cacheline; - } +--- util/cache-utils.c.orig Thu Mar 13 23:10:11 2014 ++++ util/cache-utils.c Sun Mar 16 09:06:40 2014 +@@ -81,6 +81,12 @@ void qemu_cache_utils_init(void) + qemu_cache_conf.dcache_bsize = cacheline; + qemu_cache_conf.icache_bsize = cacheline; } --#endif - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__OpenBSD__) -+ -+static void ppc_init_cacheline_sizes(void) ++void qemu_cache_utils_init(void) +{ + qemu_cache_conf.dcache_bsize = 32; + qemu_cache_conf.icache_bsize = 32; +} -+ -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> + #endif + + #endif /* _ARCH_PPC */ Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.28 diff -u -p -u -p -r1.28 PLIST --- pkg/PLIST 29 Nov 2013 21:21:38 -0000 1.28 +++ pkg/PLIST 4 Apr 2014 19:32:40 -0000 @@ -8,6 +8,7 @@ @bin bin/qemu-img @bin bin/qemu-io @bin bin/qemu-nbd +@bin bin/qemu-system-aarch64 @bin bin/qemu-system-alpha @bin bin/qemu-system-arm @bin bin/qemu-system-cris @@ -64,9 +65,11 @@ share/locale/hu/LC_MESSAGES/qemu.mo share/locale/it/LC_MESSAGES/qemu.mo share/locale/tr/LC_MESSAGES/qemu.mo share/qemu/ +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/efi-e1000.rom share/qemu/efi-eepro100.rom -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.