svn commit: r376437 - in head/emulators: qemu qemu-devel qemu-devel/files qemu-sbruno qemu-user-static
Juergen Lock
nox at FreeBSD.org
Tue Jan 6 20:04:27 UTC 2015
Author: nox
Date: Tue Jan 6 19:47:28 2015
New Revision: 376437
URL: https://svnweb.freebsd.org/changeset/ports/376437
QAT: https://qat.redports.org/buildarchive/r376437/
Log:
- Update emulators/qemu-sbruno to latest github snapshot, fixing
the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
w/o bsd-user patches and knob again. (Or at least until the
patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
PORTREVISION.
Suggested by: andrew [1] (for the benefit of testing aarch64 guests)
Added:
head/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc (contents, props changed)
head/emulators/qemu-devel/files/patch-net-tap-bsd.c (contents, props changed)
Deleted:
head/emulators/qemu-devel/files/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd
head/emulators/qemu-devel/files/extra-patch-1ebbb5b56e890741f1461662fae9728da0c76e27
head/emulators/qemu-devel/files/extra-patch-21927cffcc7bcacbb953155f778200846df9f60e
head/emulators/qemu-devel/files/extra-patch-22aae36fc2227aa772ebbc701f45319464ecae4d
head/emulators/qemu-devel/files/extra-patch-22b23eb877a8a5ec251b4ae0e71e3c7ce5397721
head/emulators/qemu-devel/files/extra-patch-2478a4e4a33d0523cc436eabb4a27b258b4358b8
head/emulators/qemu-devel/files/extra-patch-26a50e8a9d8723d406e5ef3d1449911cfa2d3454
head/emulators/qemu-devel/files/extra-patch-290a6e398b9d132a673e1f95954fc7d9a86c3baa
head/emulators/qemu-devel/files/extra-patch-30c8ccb41e2c9e1ddda7e3f8a8ac1eb5dab8b408
head/emulators/qemu-devel/files/extra-patch-38f8d5aaebdb4b1624bae86b374b5265c9f01b54
head/emulators/qemu-devel/files/extra-patch-3d175d6ed5b809976662135369c639f53780ca5c
head/emulators/qemu-devel/files/extra-patch-3ed485b9b4ef8d8ba916760aec0cdf9dbce8ca27
head/emulators/qemu-devel/files/extra-patch-5f81caf45c0d0eb2b4b852f8580a1938fb3d12c6
head/emulators/qemu-devel/files/extra-patch-6201cb17ad905dffee1b2eb76f58fb032e99b2a1
head/emulators/qemu-devel/files/extra-patch-72f0a64c7dd7be796dc2d8f2b0dab340309800e2
head/emulators/qemu-devel/files/extra-patch-790d0ef625d22ff3f1a895d266a48e2bacd63776
head/emulators/qemu-devel/files/extra-patch-8267ad2cb92b106bb16e91234f04abc49ab32036
head/emulators/qemu-devel/files/extra-patch-93cf90cb04fee057a710be43614b033e6b2e86d1
head/emulators/qemu-devel/files/extra-patch-9ac2c49c734a49025fe1647ce84728d3988ea5d2
head/emulators/qemu-devel/files/extra-patch-9ed0e07e2e07791858339874eb4d20daca858c8a
head/emulators/qemu-devel/files/extra-patch-a3129eea10f188bfd39ce83b18b25dcefbc5bffc
head/emulators/qemu-devel/files/extra-patch-a6402a4b7077af85733a1c98d63ab09f02d980ec
head/emulators/qemu-devel/files/extra-patch-a72c668c8ab84c24372ff664d9b853c2a42d37b1
head/emulators/qemu-devel/files/extra-patch-a8dc4de7f73bc6f8363c0fc81c4c6e53733c444b
head/emulators/qemu-devel/files/extra-patch-ac9f83019a2059d4bfe5cedfae35ba4151d5ac88
head/emulators/qemu-devel/files/extra-patch-ad225b8412847303d48d8e7852589456325e8f9b
head/emulators/qemu-devel/files/extra-patch-ad92220df37d1ab3120316fcc436071c78817561
head/emulators/qemu-devel/files/extra-patch-bsd-user-arm-signal
head/emulators/qemu-devel/files/extra-patch-bsd-user-arm-target_arch_thread.h
head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-proc.c
head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-socket.h
head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-sys.c
head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-target_os_stack.h
head/emulators/qemu-devel/files/extra-patch-bsd-user-mips-target_arch_vmparam.h
head/emulators/qemu-devel/files/extra-patch-bsd-user-mmap.c
head/emulators/qemu-devel/files/extra-patch-bsd-user-sparc64-target_arch_cpu.h
head/emulators/qemu-devel/files/extra-patch-bsd-user-syscall.c
head/emulators/qemu-devel/files/extra-patch-bsd-user-trapsig
head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h
head/emulators/qemu-devel/files/extra-patch-c13_tls2
head/emulators/qemu-devel/files/extra-patch-c9c55ac786f09ce575b5f67b35241ce9452896c9
head/emulators/qemu-devel/files/extra-patch-cab0d36ffd4e70b1879dc2cf860c975a7965afc3
head/emulators/qemu-devel/files/extra-patch-d5c3fb7b75b4ea80e09bf3cb7ff6dd1061968d6e
head/emulators/qemu-devel/files/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b
head/emulators/qemu-devel/files/extra-patch-d9388715135ed1f36e12e6cdbcc1be09d1657916
head/emulators/qemu-devel/files/extra-patch-f254372f13ab5cd8f25bd1ca8641ce6d67bff3fe
head/emulators/qemu-devel/files/extra-patch-f32d585446698e1faa319c95df6b4d00c16f866c
head/emulators/qemu-devel/files/extra-patch-f4319eb1a3a8393930570f061bdac6abe007b2bb
head/emulators/qemu-devel/files/extra-patch-fd7ec8e06cd1876ef478975f052ff64134d19c6c
head/emulators/qemu-devel/files/extra-patch-getvfsbyname
head/emulators/qemu-devel/files/extra-patch-inherit-interp_prefix
head/emulators/qemu-devel/files/extra-patch-kernproc
head/emulators/qemu-devel/files/extra-patch-max-arg-pages
head/emulators/qemu-devel/files/extra-patch-sysctl-0oldlen
head/emulators/qemu-devel/files/extra-patch-sysctl-hw-availpages
head/emulators/qemu-devel/files/extra-patch-sysctl-hw-pagesizes
head/emulators/qemu-devel/files/extra-patch-sysctl-hw-physmem
head/emulators/qemu-devel/files/extra-patch-target_siginfo
head/emulators/qemu-devel/files/patch-hw-usb-host-libusb.c
head/emulators/qemu-devel/files/patch-ui-gtk.c
Modified:
head/emulators/qemu-devel/Makefile
head/emulators/qemu-devel/distinfo
head/emulators/qemu-devel/files/patch-90_security
head/emulators/qemu-devel/files/patch-configure
head/emulators/qemu-devel/files/patch-qemu-include-net-net.h
head/emulators/qemu-devel/files/pcap-patch
head/emulators/qemu-devel/pkg-plist
head/emulators/qemu-sbruno/Makefile
head/emulators/qemu-sbruno/distinfo
head/emulators/qemu-user-static/Makefile
head/emulators/qemu/Makefile
Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/Makefile Tue Jan 6 19:47:28 2015 (r376437)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 2.0.2
-PORTREVISION= 12
+PORTVERSION= 2.2.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot
@@ -24,7 +23,7 @@ MAKE_ENV+= BSD_MAKE="${MAKE}"
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
- CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS BSD_USER \
+ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
STATIC_LINK DOCS
SAMBA_DESC= samba dependency (for -smb)
GNUTLS_DESC= gnutls dependency (vnc encryption)
@@ -41,73 +40,11 @@ STATIC_LINK_DESC= Statically link the ex
OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
.if !defined(QEMU_USER_STATIC)
-CONFLICTS_INSTALL= qemu-[0-9]*
+CONFLICTS_INSTALL= qemu-[0-9]* qemu-sbruno-[0-9]*
.endif
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MBSD_USER}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-790d0ef625d22ff3f1a895d266a48e2bacd63776
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-3d175d6ed5b809976662135369c639f53780ca5c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-a3129eea10f188bfd39ce83b18b25dcefbc5bffc
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fd7ec8e06cd1876ef478975f052ff64134d19c6c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9ac2c49c734a49025fe1647ce84728d3988ea5d2
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-38f8d5aaebdb4b1624bae86b374b5265c9f01b54
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-c13_tls2
-#
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-os-proc.c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-mips-target_arch_vmparam.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-inherit-interp_prefix
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-6201cb17ad905dffee1b2eb76f58fb032e99b2a1
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-syscall.c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-hw-availpages
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-0oldlen
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-mmap.c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-hw-pagesizes
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-x86_64-target_arch_vmparam.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-target_siginfo
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-arm-signal
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-getvfsbyname
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-kernproc
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-target_os_stack.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-arm-target_arch_thread.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-sparc64-target_arch_cpu.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-trapsig
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-21927cffcc7bcacbb953155f778200846df9f60e
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-os-sys.c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-hw-physmem
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-max-arg-pages
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ad92220df37d1ab3120316fcc436071c78817561
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-2478a4e4a33d0523cc436eabb4a27b258b4358b8
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ac9f83019a2059d4bfe5cedfae35ba4151d5ac88
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-d9388715135ed1f36e12e6cdbcc1be09d1657916
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-c9c55ac786f09ce575b5f67b35241ce9452896c9
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-5f81caf45c0d0eb2b4b852f8580a1938fb3d12c6
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-f32d585446698e1faa319c95df6b4d00c16f866c
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-a6402a4b7077af85733a1c98d63ab09f02d980ec
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-30c8ccb41e2c9e1ddda7e3f8a8ac1eb5dab8b408
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-22b23eb877a8a5ec251b4ae0e71e3c7ce5397721
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-1ebbb5b56e890741f1461662fae9728da0c76e27
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-93cf90cb04fee057a710be43614b033e6b2e86d1
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ad225b8412847303d48d8e7852589456325e8f9b
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-3ed485b9b4ef8d8ba916760aec0cdf9dbce8ca27
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-72f0a64c7dd7be796dc2d8f2b0dab340309800e2
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9ed0e07e2e07791858339874eb4d20daca858c8a
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-a8dc4de7f73bc6f8363c0fc81c4c6e53733c444b
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-os-socket.h
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cab0d36ffd4e70b1879dc2cf860c975a7965afc3
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8267ad2cb92b106bb16e91234f04abc49ab32036
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-290a6e398b9d132a673e1f95954fc7d9a86c3baa
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-26a50e8a9d8723d406e5ef3d1449911cfa2d3454
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-22aae36fc2227aa772ebbc701f45319464ecae4d
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-a72c668c8ab84c24372ff664d9b853c2a42d37b1
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-d5c3fb7b75b4ea80e09bf3cb7ff6dd1061968d6e
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-f4319eb1a3a8393930570f061bdac6abe007b2bb
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-f254372f13ab5cd8f25bd1ca8641ce6d67bff3fe
-.endif
-
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-smartcard-nss --disable-libssh2
@@ -286,6 +223,7 @@ CONFIGURE_ARGS+= --sparc_cpu=v9
.if ${OSVERSION} < 900033
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+CONFIGURE_ENV+= AS=${LOCALBASE}/bin/as
CONFIGURE_ENV+= LD=${LOCALBASE}/bin/ld
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
@@ -338,8 +276,8 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
.endif
- @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
- @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
+ ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
+ ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
@(cd ${STAGEDIR}${PREFIX}/etc/qemu && \
${MV} -i target-x86_64.conf target-x86_64.conf.sample)
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
Modified: head/emulators/qemu-devel/distinfo
==============================================================================
--- head/emulators/qemu-devel/distinfo Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/distinfo Tue Jan 6 19:47:28 2015 (r376437)
@@ -1,2 +1,2 @@
-SHA256 (qemu/2.0.2/qemu-2.0.2.tar.bz2) = 20b207238015b773a8b8752801397bac2bb284b157a4999fb7a1039625d282cc
-SIZE (qemu/2.0.2/qemu-2.0.2.tar.bz2) = 12841893
+SHA256 (qemu/2.2.0/qemu-2.2.0.tar.bz2) = b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c
+SIZE (qemu/2.2.0/qemu-2.2.0.tar.bz2) = 24316697
Modified: head/emulators/qemu-devel/files/patch-90_security
==============================================================================
--- head/emulators/qemu-devel/files/patch-90_security Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/files/patch-90_security Tue Jan 6 19:47:28 2015 (r376437)
@@ -14,27 +14,6 @@ Index: qemu/hw/dma/i8257.c
ldebug ("dma_pos %d size %d\n", n, (r->base[COUNT] + 1) << ncont);
}
-Index: qemu/hw/block/fdc.c
-@@ -1445,7 +1445,8 @@ static uint32_t fdctrl_read_data(FDCtrl
- fd_sector(cur_drv));
- return 0;
- }
-- if (bdrv_read(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
-+ if (cur_drv->bs == NULL ||
-+ bdrv_read(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_DPRINTF("error getting sector %d\n",
- fd_sector(cur_drv));
- /* Sure, image size is too small... */
-@@ -1905,7 +1906,8 @@ static void fdctrl_write_data(FDCtrl *fd
- if (pos == FD_SECTOR_LEN - 1 ||
- fdctrl->data_pos == fdctrl->data_len) {
- cur_drv = get_cur_drv(fdctrl);
-- if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
-+ if (cur_drv->bs == NULL ||
-+ bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_DPRINTF("error writing sector %d\n",
- fd_sector(cur_drv));
- return;
Index: qemu-0.8.2/hw/audio/sb16.c
@@ -1235,8 +1235,10 @@ static int SB_read_DMA (void *opaque, in
s->block_size);
@@ -49,14 +28,3 @@ Index: qemu-0.8.2/hw/audio/sb16.c
}
return dma_pos;
-Index: qemu/hw/intc/i8259.c
-@@ -291,7 +291,8 @@ static void pic_ioport_write(void *opaqu
- s->init4 = val & 1;
- s->single_mode = val & 2;
- if (val & 0x08) {
-- hw_error("level sensitive irq not supported");
-+ /* hw_error("level sensitive irq not supported"); */
-+ return;
- }
- } else if (val & 0x08) {
- if (val & 0x04) {
Modified: head/emulators/qemu-devel/files/patch-configure
==============================================================================
--- head/emulators/qemu-devel/files/patch-configure Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/files/patch-configure Tue Jan 6 19:47:28 2015 (r376437)
@@ -1,24 +1,24 @@
--- a/configure
+++ a/configure
-@@ -192,7 +192,7 @@ gcov="no"
- gcov_tool="gcov"
- EXESUF=""
+@@ -273,7 +273,7 @@ DSOSUF=".so"
+ LDFLAGS_SHARED="-shared"
+ modules="no"
prefix="/usr/local"
-mandir="\${prefix}/share/man"
+mandir="\${prefix}/man"
datadir="\${prefix}/share"
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
-@@ -1980,7 +1980,7 @@ if test "$gtk" != "no"; then
- if $pkg_config --exists "$gtkpackage >= $gtkversion"; then
- gtk_cflags=`$pkg_config --cflags $gtkpackage`
- gtk_libs=`$pkg_config --libs $gtkpackage`
+@@ -2062,7 +2062,7 @@ if test "$gtk" != "no"; then
+ if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
+ gtk_libs="$gtk_libs -lX11"
+ fi
- libs_softmmu="$gtk_libs $libs_softmmu"
+ libs_softmmu="$gtk_libs -lintl $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
- feature_not_found "gtk" "Install gtk2 or gtk3 (requires --with-gtkabi=3.0 option to configure) devel"
-@@ -3320,15 +3320,18 @@ if compile_prog "" "" ; then
+ feature_not_found "gtk" "Install gtk2 or gtk3 devel"
+@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then
fi
# Check if tools are available to build documentation.
@@ -45,7 +45,7 @@
fi
# Search for bswap_32 function
-@@ -3498,6 +3501,17 @@ fi
+@@ -3650,6 +3653,17 @@ fi
# check for libusb
if test "$libusb" != "no" ; then
@@ -63,7 +63,7 @@
if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
libusb="yes"
libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -3510,6 +3524,7 @@ if test "$libusb" != "no" ; then
+@@ -3662,6 +3676,7 @@ if test "$libusb" != "no" ; then
fi
libusb="no"
fi
Added: head/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc Tue Jan 6 19:47:28 2015 (r376437)
@@ -0,0 +1,12 @@
+--- a/disas/libvixl/a64/disasm-a64.cc
++++ b/disas/libvixl/a64/disasm-a64.cc
+@@ -1337,7 +1337,8 @@ void Disassembler::AppendPCRelativeOffse
+ int64_t offset) {
+ USE(instr);
+ char sign = (offset < 0) ? '-' : '+';
+- AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
++ // AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
++ AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset);
+ }
+
+
Added: head/emulators/qemu-devel/files/patch-net-tap-bsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/qemu-devel/files/patch-net-tap-bsd.c Tue Jan 6 19:47:28 2015 (r376437)
@@ -0,0 +1,10 @@
+--- a/net/tap-bsd.c
++++ b/net/tap-bsd.c
+@@ -29,6 +29,7 @@
+
+ #if defined(__NetBSD__) || defined(__FreeBSD__)
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ #include <net/if_tap.h>
+ #endif
Modified: head/emulators/qemu-devel/files/patch-qemu-include-net-net.h
==============================================================================
--- head/emulators/qemu-devel/files/patch-qemu-include-net-net.h Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/files/patch-qemu-include-net-net.h Tue Jan 6 19:47:28 2015 (r376437)
@@ -10,15 +10,3 @@ Index: qemu/include/net/net.h
#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
#define DEFAULT_BRIDGE_INTERFACE "br0"
-Index: qemu/net/tap_int.h
-@@ -29,8 +29,8 @@
- #include "qemu-common.h"
- #include "qemu-option.h"
-
--#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
--#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
-+#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup"
-+#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown"
-
- int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
-
Modified: head/emulators/qemu-devel/files/pcap-patch
==============================================================================
--- head/emulators/qemu-devel/files/pcap-patch Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/files/pcap-patch Tue Jan 6 19:47:28 2015 (r376437)
@@ -1,16 +1,16 @@
--- configure.orig
+++ configure
-@@ -324,6 +324,9 @@ tpm="no"
- libssh2=""
+@@ -335,6 +335,9 @@ libssh2=""
vhdx=""
- quorum="no"
+ quorum=""
+ numa=""
+pcap="no"
+pcap_create="no"
+bpf="no"
# parse CC options first
for opt do
-@@ -865,6 +868,10 @@ for opt do
+@@ -888,6 +891,10 @@ for opt do
;;
--enable-vnc-ws) vnc_ws="yes"
;;
@@ -21,7 +21,7 @@
--disable-slirp) slirp="no"
;;
--disable-uuid) uuid="no"
-@@ -2130,6 +2137,51 @@ EOF
+@@ -2216,6 +2223,51 @@ EOF
fi
##########################################
@@ -73,7 +73,7 @@
# VNC TLS/WS detection
if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then
cat > $TMPC <<EOF
-@@ -4133,6 +4185,7 @@ echo "Audio drivers $audio_drv_list"
+@@ -4286,6 +4338,7 @@ echo "Audio drivers $audio_drv_list"
echo "Block whitelist (rw) $block_drv_rw_whitelist"
echo "Block whitelist (ro) $block_drv_ro_whitelist"
echo "VirtFS support $virtfs"
@@ -81,7 +81,7 @@
echo "VNC support $vnc"
if test "$vnc" = "yes" ; then
echo "VNC TLS support $vnc_tls"
-@@ -4297,6 +4350,15 @@ fi
+@@ -4447,6 +4500,15 @@ fi
if test "$profiler" = "yes" ; then
echo "CONFIG_PROFILER=y" >> $config_host_mak
fi
@@ -98,10 +98,11 @@
echo "CONFIG_SLIRP=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
Index: net/clients.h
-@@ -47,6 +47,11 @@ int net_init_tap(const NetClientOptions
- int net_init_bridge(const NetClientOptions *opts, const char *name,
- NetClientState *peer);
+@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
+ int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
+ NetClientState *peer);
++
+#ifdef CONFIG_PCAP
+int net_init_pcap(const NetClientOptions *opts, const char *name,
+ NetClientState *peer);
@@ -357,7 +358,7 @@ Index: net/net.c
--- qapi-schema.json.orig
+++ qapi-schema.json
-@@ -2622,6 +2622,10 @@
+@@ -2165,6 +2165,10 @@
'*br': 'str',
'*helper': 'str' } }
@@ -368,21 +369,21 @@ Index: net/net.c
##
# @NetdevHubPortOptions
#
-@@ -2648,6 +2652,7 @@
- 'nic': 'NetLegacyNicOptions',
+@@ -2232,6 +2236,7 @@
'user': 'NetdevUserOptions',
'tap': 'NetdevTapOptions',
+ 'l2tpv3': 'NetdevL2TPv3Options',
+ 'pcap': 'NetdevPcapOptions',
'socket': 'NetdevSocketOptions',
'vde': 'NetdevVdeOptions',
'dump': 'NetdevDumpOptions',
--- net/hub.c.orig
+++ net/hub.c
-@@ -322,6 +322,7 @@ void net_hub_check_clients(void)
- case NET_CLIENT_OPTIONS_KIND_TAP:
- case NET_CLIENT_OPTIONS_KIND_SOCKET:
- case NET_CLIENT_OPTIONS_KIND_VDE:
+@@ -325,6 +325,7 @@ void net_hub_check_clients(void)
+ case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
+ case NET_CLIENT_OPTIONS_KIND_PCAP:
has_host_dev = 1;
break;
default:
+ break;
+ }
Modified: head/emulators/qemu-devel/pkg-plist
==============================================================================
--- head/emulators/qemu-devel/pkg-plist Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-devel/pkg-plist Tue Jan 6 19:47:28 2015 (r376437)
@@ -25,6 +25,7 @@
%%NONX86%%bin/qemu-system-sh4eb
%%NONX86%%bin/qemu-system-sparc
%%NONX86%%bin/qemu-system-sparc64
+%%NONX86%%bin/qemu-system-tricore
%%NONX86%%bin/qemu-system-unicore32
%%BSD_USER%%bin/qemu-arm%%STATIC%%
%%BSD_USER%%bin/qemu-i386%%STATIC%%
@@ -85,6 +86,8 @@
%%SOFTMMU%%%%DATADIR%%/kvmvapic.bin
%%SOFTMMU%%%%DATADIR%%/qemu-icon.bmp
%%SOFTMMU%%%%DATADIR%%/qemu_logo_no_text.svg
+%%SOFTMMU%%%%DATADIR%%/trace-events
+%%SOFTMMU%%%%DATADIR%%/u-boot.e500
%%SOFTMMU%%%%DATADIR%%/keymaps/ar
%%SOFTMMU%%%%DATADIR%%/keymaps/bepo
%%SOFTMMU%%%%DATADIR%%/keymaps/common
@@ -127,3 +130,4 @@
%%GTK2%%share/locale/it/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/hu/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/tr/LC_MESSAGES/qemu.mo
+%%GTK2%%share/locale/zh_CN/LC_MESSAGES/qemu.mo
Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-sbruno/Makefile Tue Jan 6 19:47:28 2015 (r376437)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 2.2.50.g20141230
+PORTVERSION= 2.2.50.g20150106
CATEGORIES= emulators
MASTER_SITES= GH GHC \
LOCAL/nox \
@@ -20,8 +20,8 @@ COMMENT?= QEMU CPU Emulator - github bsd
USE_GITHUB= yes
GH_ACCOUNT= seanbruno
GH_PROJECT= ${PORTNAME}-bsd-user
-GH_COMMIT= 11db3cc
-GH_TAGNAME= 11db3cc
+GH_COMMIT= d1fbcfc
+GH_TAGNAME= ${GH_COMMIT}
HAS_CONFIGURE= yes
USES= gmake pkgconfig bison perl5 python:2,build
USE_PERL5= build
Modified: head/emulators/qemu-sbruno/distinfo
==============================================================================
--- head/emulators/qemu-sbruno/distinfo Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-sbruno/distinfo Tue Jan 6 19:47:28 2015 (r376437)
@@ -1,4 +1,4 @@
-SHA256 (qemu/2.2.50.g20141230/qemu-2.2.50.g20141230.tar.gz) = 17d9b7850032a2537f883b827b9e8a5c6e0208f8141b741624624d79ae9c0377
-SIZE (qemu/2.2.50.g20141230/qemu-2.2.50.g20141230.tar.gz) = 10698531
-SHA256 (qemu/2.2.50.g20141230/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.2.50.g20141230/dtc-v1.4.0.tar.gz) = 131893
+SHA256 (qemu/2.2.50.g20150106/qemu-2.2.50.g20150106.tar.gz) = 7278a5b06e5a55efd5965eac9a5f9371c79fc2da556765d6fc6ed4b20226baf4
+SIZE (qemu/2.2.50.g20150106/qemu-2.2.50.g20150106.tar.gz) = 10698540
+SHA256 (qemu/2.2.50.g20150106/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.2.50.g20150106/dtc-v1.4.0.tar.gz) = 131893
Modified: head/emulators/qemu-user-static/Makefile
==============================================================================
--- head/emulators/qemu-user-static/Makefile Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu-user-static/Makefile Tue Jan 6 19:47:28 2015 (r376437)
@@ -2,7 +2,7 @@
# $FreeBSD$
MAINTAINER= nox at FreeBSD.org
-COMMENT= QEMU CPU Emulator development version - static bsd-user targets
+COMMENT= QEMU CPU Emulator github bsd-user branch - static user targets
PKGNAMESUFFIX= -user-static
QEMU_USER_STATIC= yes
@@ -11,9 +11,7 @@ DESCR= ${.CURDIR}/pkg-descr
OPTIONS_SLAVE= STATIC_LINK BSD_USER X86_TARGETS
OPTIONS_EXCLUDE=SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
CDROM_DMA PCAP USBREDIR GNS3 DOCS
-# XXX soon, when it builds again on 8 and 9:
-# MASTERDIR= ${.CURDIR}/../qemu-sbruno
-MASTERDIR= ${.CURDIR}/../qemu-devel
+MASTERDIR= ${.CURDIR}/../qemu-sbruno
post-install:
@${RM} -r ${STAGEDIR}${PREFIX}/bin/qemu-ga
Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile Tue Jan 6 19:45:23 2015 (r376436)
+++ head/emulators/qemu/Makefile Tue Jan 6 19:47:28 2015 (r376437)
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 0.11.1
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://bellard.org/qemu/
@@ -20,7 +20,7 @@ USE_PERL5= build
PATCH_STRIP= -p1
MAKE_ENV+= BSD_MAKE="${MAKE}"
ONLY_FOR_ARCHS= amd64 i386
-CONFLICTS= qemu-devel-[0-9]*
+CONFLICTS= qemu-devel-[0-9]* qemu-sbruno-[0-9]*
OPTIONS_DEFINE= KQEMU RTL8139_TIMER SAMBA SDL GNUTLS CURL PCAP GNS3 \
CDROM_DMA ADD_AUDIO ALL_TARGETS DOCS
More information about the svn-ports-all
mailing list