From 4ad21e11e162cf9890a863e967606963be94a3c3 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 17 Aug 2018 07:18:59 +0000
Subject: [PATCH] Update to qemu-3.0.0.

from Brad (maintainer)
---
 emulators/qemu/Makefile                            | 13 +++++++------
 emulators/qemu/distinfo                            |  4 ++--
 emulators/qemu/patches/patch-configure             |  8 ++++----
 .../qemu/patches/patch-roms_vgabios_vgabios_c      | 14 --------------
 4 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 emulators/qemu/patches/patch-roms_vgabios_vgabios_c

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index fcf1e236eca..2afca197388 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.178 2018/05/02 08:21:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.179 2018/08/17 07:18:59 ajacoutot Exp $
 
 USE_WXNEEDED=	Yes
 
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64 arm i386 powerpc sparc64
 
 COMMENT=	multi system emulator
 
-DISTNAME=	qemu-2.12.0
+DISTNAME=	qemu-3.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
@@ -18,11 +18,11 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>
 # GPLv2, LGPLv2 and BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl drm \
+WANTLIB=	SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl \
 		epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls \
 		gobject-2.0 gthread-2.0 gtk-3 intl iscsi jpeg lzo2 m \
 		curses nettle nfs pango-1.0 pangocairo-1.0 pcre2-8 \
-		pixman-1 png ssh2 usb-1.0 util vte-2.91 xkbcommon z \
+		pixman-1 png ssh2 usb-1.0 util vte-2.91 xkbcommon xml2 z \
 		${COMPILER_LIBCXX}
 
 # Using TLS emulation layer
@@ -36,12 +36,12 @@ BUILD_DEPENDS=	devel/gettext-tools \
 LIB_DEPENDS=	archivers/bzip2 \
 		archivers/lzo2 \
 		devel/capstone/main \
-		devel/dtc>=1.4.4 \
+		devel/dtc \
 		devel/gettext \
 		devel/glib2 \
 		devel/libiscsi \
 		devel/libnfs \
-		devel/libusb1>=1.0.20 \
+		devel/libusb1 \
 		devel/sdl2 \
 		devel/vte3 \
 		graphics/jpeg \
@@ -50,6 +50,7 @@ LIB_DEPENDS=	archivers/bzip2 \
 		security/gnutls \
 		security/libnettle \
 		security/libssh2 \
+		textproc/libxml \
 		x11/gtk+3 \
 		x11/xkbcommon
 
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 8b2edeea6fc..9bbfba8e8d7 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qemu-2.12.0.tar.xz) = 5pMB82H/Zb9dq9ihkZauqlYTwbWuFnjwgjvfUOfVxvw=
-SIZE (qemu-2.12.0.tar.xz) = 35405044
+SHA256 (qemu-3.0.0.tar.xz) = jXr2T+i9XqXDvfFxMai4WEkbzOHuODlCWm2R+4IbVxM=
+SIZE (qemu-3.0.0.tar.xz) = 35624516
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index 39cc02a6820..078c3ae7795 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.56 2018/05/02 08:21:13 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.57 2018/08/17 07:18:59 ajacoutot Exp $
 
 - Fix TLS test to work with Clang's emulated TLS
 - Fix curses test to work on OpenBSD
@@ -7,7 +7,7 @@ $OpenBSD: patch-configure,v 1.56 2018/05/02 08:21:13 ajacoutot Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -1797,7 +1797,7 @@ static __thread int tls_var;
+@@ -1876,7 +1876,7 @@ static __thread int tls_var;
  int main(void) { return tls_var; }
  EOF
  
@@ -16,7 +16,7 @@ Index: configure
      error_exit "Your compiler does not support the __thread specifier for " \
  	"Thread-Local Storage (TLS). Please upgrade to a version that does."
  fi
-@@ -3276,6 +3276,7 @@ if test "$curses" != "no" ; then
+@@ -3371,6 +3371,7 @@ if test "$curses" != "no" ; then
    fi
    curses_found=no
    cat > $TMPC << EOF
@@ -24,7 +24,7 @@ Index: configure
  #include <locale.h>
  #include <curses.h>
  #include <wchar.h>
-@@ -5422,10 +5423,6 @@ write_c_skeleton
+@@ -5554,10 +5555,6 @@ write_c_skeleton
  if test "$gcov" = "yes" ; then
    CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
diff --git a/emulators/qemu/patches/patch-roms_vgabios_vgabios_c b/emulators/qemu/patches/patch-roms_vgabios_vgabios_c
deleted file mode 100644
index e1026c48792..00000000000
--- a/emulators/qemu/patches/patch-roms_vgabios_vgabios_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-roms_vgabios_vgabios_c,v 1.1 2013/01/29 10:57:03 sthen Exp $
-
-http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg03650.html
-
---- roms/vgabios/vgabios.c.orig	Tue Jan 29 10:05:22 2013
-+++ roms/vgabios/vgabios.c	Tue Jan 29 10:06:15 2013
-@@ -204,6 +204,7 @@ vgabios_website:
- .byte	0x00
- 
- #ifdef PCIBIOS
-+.align 4 // DWORD alignment required by PCI Firmware Specification
- vgabios_pci_data:
- .ascii "PCIR"
- #ifdef CIRRUS