Here is an update to QEMU 1.1-rc1 for anyone wanting to do any testing and provide any feedback before the actual release.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.85 diff -u -p -r1.85 Makefile --- Makefile 16 Mar 2012 11:40:53 -0000 1.85 +++ Makefile 14 May 2012 03:46:41 -0000 @@ -5,7 +5,7 @@ BROKEN-hppa= compiler bug with gcc 4.2 COMMENT= multi system emulator -DISTNAME= qemu-1.0.1 +DISTNAME= qemu-1.1-rc1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ @@ -34,7 +34,7 @@ LIB_DEPENDS= devel/glib2 \ MODPY_RUNDEP= No MAKE_ENV= V=1 -FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples +FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib @@ -75,13 +75,15 @@ FLAVORS= debug FLAVOR?= .if ${FLAVOR:Mdebug} +CFLAGS+= -O0 CONFIGURE_ARGS+=--enable-debug +.else +CONFIGURE_ARGS+=--disable-debug-info .endif NO_REGRESS= Yes post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \ ${PREFIX}/share/examples/qemu ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo 16 Mar 2012 11:40:53 -0000 1.19 +++ distinfo 14 May 2012 01:10:24 -0000 @@ -1,5 +1,5 @@ -MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA== -RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc= -SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo= -SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g= -SIZE (qemu-1.0.1.tar.gz) = 10853005 +MD5 (qemu-1.1-rc1.tar.gz) = +5KS6Fg8DAmAPrJVZPjGng== +RMD160 (qemu-1.1-rc1.tar.gz) = 5T/eyaTVJYlWZSIOiVyS7ennL6o= +SHA1 (qemu-1.1-rc1.tar.gz) = o7qbN0Z+qUqqVnMJp1ZNY/9GBqM= +SHA256 (qemu-1.1-rc1.tar.gz) = GnQwYheSUHfTJ4iRb5tl0swrJLAOW7O7rw7bDrSU6CQ= +SIZE (qemu-1.1-rc1.tar.gz) = 11702330 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.22 diff -u -p -r1.22 patch-configure --- patches/patch-configure 16 Mar 2012 11:40:53 -0000 1.22 +++ patches/patch-configure 14 May 2012 01:19:24 -0000 @@ -1,29 +1,14 @@ $OpenBSD: patch-configure,v 1.22 2012/03/16 11:40:53 fgsch Exp $ ---- configure.orig Fri Feb 17 14:45:39 2012 -+++ configure Fri Feb 17 16:02:57 2012 -@@ -235,13 +235,11 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" - - # default flags for all hosts - QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" --CFLAGS="-g $CFLAGS" - QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" - QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" - QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" - QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" - QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" --LDFLAGS="-g $LDFLAGS" - - # make source path absolute - source_path=`cd "$source_path"; pwd` -@@ -2684,8 +2682,9 @@ fi +--- configure.orig Thu May 10 08:11:22 2012 ++++ configure Sun May 13 21:19:06 2012 +@@ -2835,10 +2835,6 @@ fi # End of CC checks # After here, no more $cc or $ld runs -if test "$debug" = "no" ; then - CFLAGS="-O2 $CFLAGS" -+if test "$debug" = "yes" ; then -+ CFLAGS="$CFLAGS -O0 -g" -+ LDFLAGS="$LDFLAGS -g" - fi - +-fi +- # Consult white-list to determine whether to enable werror + # by default. Only enable by default for git builds + z_version=`cut -f3 -d. $source_path/VERSION` Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.20 diff -u -p -r1.20 PLIST --- pkg/PLIST 12 Dec 2011 10:56:56 -0000 1.20 +++ pkg/PLIST 14 May 2012 03:42:26 -0000 @@ -89,6 +89,7 @@ share/qemu/keymaps/sl share/qemu/keymaps/sv share/qemu/keymaps/th share/qemu/keymaps/tr +share/qemu/kvmvapic.bin share/qemu/linuxboot.bin share/qemu/mpc8544ds.dtb share/qemu/multiboot.bin @@ -105,6 +106,7 @@ share/qemu/pxe-ne2k_pci.rom share/qemu/pxe-pcnet.rom share/qemu/pxe-rtl8139.rom share/qemu/pxe-virtio.rom +share/qemu/qemu-icon.bmp share/qemu/s390-zipl.rom share/qemu/sgabios.bin share/qemu/slof.bin -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
