On Fri, May 10, 2013 at 02:02:55PM -0400, Brad Smith wrote: > To anyone interested in testing QEMU 1.5 with the rc1 release..
Here is an update to rc2.. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.104 diff -u -p -r1.104 Makefile --- Makefile 19 Apr 2013 02:47:43 -0000 1.104 +++ Makefile 17 May 2013 14:26:40 -0000 @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.4.1 +DISTNAME= qemu-1.5.0-rc2 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -16,18 +16,24 @@ MAINTAINER= Brad Smith <b...@comstyle.co # GPLv2, LGPLv2 and BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB= GL SDL X11 c curl glib-2.0 gnutls gthread-2.0 jpeg m ncurses \ - pixman-1 png pthread pthread-stubs util z +WANTLIB= GL SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \ + Xrandr Xrender atk-1.0 c cairo curl 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 MODULES= devel/gettext \ lang/python BUILD_DEPENDS= textproc/texi2html LIB_DEPENDS= devel/glib2 \ devel/sdl \ + devel/vte \ graphics/jpeg \ graphics/png \ net/curl \ - security/gnutls + security/gnutls \ + security/libssh2 \ + x11/gtk+2 MODPY_RUNDEP= No @@ -58,6 +64,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --audio-drv-list=sdl \ --disable-bsd-user \ --disable-libiscsi \ + --disable-libusb \ --disable-smartcard-nss \ --disable-spice \ --disable-uuid \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.27 diff -u -p -r1.27 distinfo --- distinfo 19 Apr 2013 02:47:43 -0000 1.27 +++ distinfo 16 May 2013 18:17:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.4.1.tar.bz2) = dQY6kyYiFgfeNZnon7WvgPLYCA3cVcolP/8ROENDLfE= -SIZE (qemu-1.4.1.tar.bz2) = 10417738 +SHA256 (qemu-1.5.0-rc2.tar.bz2) = 4yejTH9webwzFlI6v79OxcOSCUkoeK30mHDKPG5iMf0= +SIZE (qemu-1.5.0-rc2.tar.bz2) = 11933048 Index: patches/patch-Makefile_objs =================================================================== RCS file: patches/patch-Makefile_objs diff -N patches/patch-Makefile_objs --- patches/patch-Makefile_objs 19 Apr 2013 02:47:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-Makefile_objs,v 1.1 2013/04/19 02:47:43 brad Exp $ ---- Makefile.objs.orig Fri Feb 15 18:05:35 2013 -+++ Makefile.objs Sun Apr 14 04:06:36 2013 -@@ -16,16 +16,7 @@ block-obj-y += qapi-types.o qapi-visit.o - - block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o - block-obj-y += qemu-coroutine-sleep.o --ifeq ($(CONFIG_UCONTEXT_COROUTINE),y) --block-obj-$(CONFIG_POSIX) += coroutine-ucontext.o --else --ifeq ($(CONFIG_SIGALTSTACK_COROUTINE),y) --block-obj-$(CONFIG_POSIX) += coroutine-sigaltstack.o --else --block-obj-$(CONFIG_POSIX) += coroutine-gthread.o --endif --endif --block-obj-$(CONFIG_WIN32) += coroutine-win32.o -+block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o - - ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) - # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.31 diff -u -p -r1.31 patch-configure --- patches/patch-configure 19 Apr 2013 02:47:43 -0000 1.31 +++ patches/patch-configure 16 May 2013 18:24:03 -0000 @@ -1,95 +1,7 @@ $OpenBSD: patch-configure,v 1.31 2013/04/19 02:47:43 brad Exp $ ---- configure.orig Mon Apr 15 16:25:18 2013 -+++ configure Mon Apr 15 20:55:05 2013 -@@ -3035,34 +3035,67 @@ fi - ########################################## - # check and set a backend for coroutine - --# default is ucontext, but always fallback to gthread --# windows autodetected by make --if test "$coroutine" = "" -o "$coroutine" = "ucontext"; then -- if test "$darwin" != "yes"; then -- cat > $TMPC << EOF -+# We prefer ucontext, but it's not always possible. The fallback -+# is sigcontext. gthread is not selectable except explicitly, because -+# it is not functional enough to run QEMU proper. (It is occasionally -+# useful for debugging purposes.) On Windows the only valid backend -+# is the Windows-specific one. -+ -+ucontext_works=no -+if test "$darwin" != "yes"; then -+ cat > $TMPC << EOF - #include <ucontext.h> - #ifdef __stub_makecontext - #error Ignoring glibc stub makecontext which will always fail - #endif - int main(void) { makecontext(0, 0, 0); return 0; } - EOF -- if compile_prog "" "" ; then -- coroutine_backend=ucontext -- else -- coroutine_backend=gthread -- fi -+ if compile_prog "" "" ; then -+ ucontext_works=yes - fi --elif test "$coroutine" = "gthread" ; then -- coroutine_backend=gthread --elif test "$coroutine" = "windows" ; then -- coroutine_backend=windows --elif test "$coroutine" = "sigaltstack" ; then -- coroutine_backend=sigaltstack -+fi -+ -+if test "$coroutine" = ""; then -+ if test "$mingw32" = "yes"; then -+ coroutine=win32 -+ elif test "$ucontext_works" = "yes"; then -+ coroutine=ucontext -+ else -+ coroutine=sigaltstack -+ fi - else -- echo -- echo "Error: unknown coroutine backend $coroutine" -- echo -- exit 1 -+ case $coroutine in -+ windows) -+ if test "$mingw32" != "yes"; then -+ echo -+ echo "Error: 'windows' coroutine backend only valid for Windows" -+ echo -+ exit 1 -+ fi -+ # Unfortunately the user visible backend name doesn't match the -+ # coroutine-*.c filename for this case, so we have to adjust it here. -+ coroutine=win32 -+ ;; -+ ucontext) -+ if test "$ucontext_works" != "yes"; then -+ feature_not_found "ucontext" -+ fi -+ ;; -+ gthread|sigaltstack) -+ if test "$mingw32" = "yes"; then -+ echo -+ echo "Error: only the 'windows' coroutine backend is valid for Windows" -+ echo -+ exit 1 -+ fi -+ ;; -+ *) -+ echo -+ echo "Error: unknown coroutine backend $coroutine" -+ echo -+ exit 1 -+ ;; -+ esac - fi - - ########################################## -@@ -3164,8 +3197,6 @@ fi +--- configure.orig Wed May 15 17:39:45 2013 ++++ configure Thu May 16 14:22:06 2013 +@@ -3390,8 +3390,6 @@ fi if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" @@ -98,25 +10,3 @@ $OpenBSD: patch-configure,v 1.31 2013/04 fi -@@ -3345,7 +3376,7 @@ echo "OpenGL support $opengl" - echo "libiscsi support $libiscsi" - echo "build guest agent $guest_agent" - echo "seccomp support $seccomp" --echo "coroutine backend $coroutine_backend" -+echo "coroutine backend $coroutine" - echo "GlusterFS support $glusterfs" - echo "virtio-blk-data-plane $virtio_blk_data_plane" - echo "gcov $gcov_tool" -@@ -3668,11 +3699,7 @@ if test "$rbd" = "yes" ; then - echo "CONFIG_RBD=y" >> $config_host_mak - fi - --if test "$coroutine_backend" = "ucontext" ; then -- echo "CONFIG_UCONTEXT_COROUTINE=y" >> $config_host_mak --elif test "$coroutine_backend" = "sigaltstack" ; then -- echo "CONFIG_SIGALTSTACK_COROUTINE=y" >> $config_host_mak --fi -+echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak - - if test "$open_by_handle_at" = "yes" ; then - echo "CONFIG_OPEN_BY_HANDLE=y" >> $config_host_mak Index: patches/patch-include_qemu-common_h =================================================================== RCS file: patches/patch-include_qemu-common_h diff -N patches/patch-include_qemu-common_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-include_qemu-common_h 16 May 2013 18:24:10 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- include/qemu-common.h.orig Wed May 15 17:39:46 2013 ++++ include/qemu-common.h Thu May 16 14:23:53 2013 +@@ -45,6 +45,7 @@ + #if defined(__GLIBC__) + # include <pty.h> + #elif defined CONFIG_BSD ++# include <termios.h> + # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + # include <libutil.h> + # else Index: patches/patch-tests_Makefile =================================================================== RCS file: patches/patch-tests_Makefile diff -N patches/patch-tests_Makefile --- patches/patch-tests_Makefile 19 Apr 2013 02:47:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-tests_Makefile,v 1.1 2013/04/19 02:47:43 brad Exp $ ---- tests/Makefile.orig Sun Apr 14 04:09:05 2013 -+++ tests/Makefile Sun Apr 14 04:09:33 2013 -@@ -24,19 +24,7 @@ gcov-files-test-string-input-visitor-y = qapi/string-i - check-unit-y += tests/test-string-output-visitor$(EXESUF) - gcov-files-test-string-output-visitor-y = qapi/string-output-visitor.c - check-unit-y += tests/test-coroutine$(EXESUF) --ifeq ($(CONFIG_WIN32),y) --gcov-files-test-coroutine-y = coroutine-win32.c --else --ifeq ($(CONFIG_UCONTEXT_COROUTINE),y) --gcov-files-test-coroutine-y = coroutine-ucontext.c --else --ifeq ($(CONFIG_SIGALTSTACK_COROUTINE),y) --gcov-files-test-coroutine-y = coroutine-sigaltstack.c --else --gcov-files-test-coroutine-y = coroutine-gthread.c --endif --endif --endif -+gcov-files-test-coroutine-y = coroutine-$(CONFIG_COROUTINE_BACKEND).c - check-unit-y += tests/test-visitor-serialization$(EXESUF) - check-unit-y += tests/test-iov$(EXESUF) - gcov-files-test-iov-y = util/iov.c Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.25 diff -u -p -r1.25 PLIST --- pkg/PLIST 20 Mar 2013 00:46:01 -0000 1.25 +++ pkg/PLIST 14 May 2013 17:07:07 -0000 @@ -20,6 +20,7 @@ @bin bin/qemu-system-mips64 @bin bin/qemu-system-mips64el @bin bin/qemu-system-mipsel +@bin bin/qemu-system-moxie @bin bin/qemu-system-or32 @bin bin/qemu-system-ppc @bin bin/qemu-system-ppc64 @@ -53,10 +54,24 @@ share/examples/qemu/qemu-ifup share/examples/qemu/target-x86_64.conf @sample ${SYSCONFDIR}/qemu/ @sample ${SYSCONFDIR}/qemu/target-x86_64.conf +share/locale/de_DE/ +share/locale/de_DE/LC_MESSAGES/ +share/locale/de_DE/LC_MESSAGES/qemu.mo +share/locale/fr_FR/ +share/locale/fr_FR/LC_MESSAGES/ +share/locale/fr_FR/LC_MESSAGES/qemu.mo +share/locale/it/LC_MESSAGES/qemu.mo +share/locale/tr/LC_MESSAGES/qemu.mo share/qemu/ share/qemu/acpi-dsdt.aml share/qemu/bamboo.dtb share/qemu/bios.bin +share/qemu/efi-e1000.rom +share/qemu/efi-eepro100.rom +share/qemu/efi-ne2k_pci.rom +share/qemu/efi-pcnet.rom +share/qemu/efi-rtl8139.rom +share/qemu/efi-virtio.rom share/qemu/keymaps/ share/qemu/keymaps/ar share/qemu/keymaps/bepo @@ -112,6 +127,7 @@ share/qemu/pxe-rtl8139.rom share/qemu/pxe-virtio.rom share/qemu/q35-acpi-dsdt.aml share/qemu/qemu-icon.bmp +share/qemu/s390-ccw.img 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.
