Update to 0.8.1:

Changes:

  - USB tablet support (Brad Campbell, Anthony Liguori)
  - win32 host serial support (Kazu)
  - PC speaker support (Joachim Henke)
  - IDE LBA48 support (Jens Axboe)
  - SSE3 support
  - Solaris port (Ben Taylor)
  - Preliminary SH4 target (Samuel Tardieu)
  - VNC server (Anthony Liguori)
  - slirp fixes (Ed Swierk et al.)
  - USB fixes
  - ARM Versatile Platform Baseboard emulation (Paul Brook)

8 files changed, 77 insertions, 201 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 1e968ded7a7..11f203e71c2 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/05/06 18:09:53 xtraeme Exp $
 #
 
-DISTNAME=		qemu-0.8.0
-PKGREVISION=		1
+DISTNAME=		qemu-0.8.1
 CATEGORIES=		emulators
 MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
 
@@ -46,8 +45,9 @@ PKG_FAIL_REASON+=	"${PKGNAME} cannot use "${CC_VERSION:Q}
 .endif
 
 post-install:
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/qemu
 	${INSTALL_DATA} ${FILESDIR:Q}/Makefile.multinode-NetBSD \
-		${PREFIX:Q}/share/doc/qemu
+		${PREFIX:Q}/share/doc/qemu/
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 6443e650719..6f6805c7895 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,16 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2006/01/01 13:48:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/05/06 18:09:53 xtraeme Exp $
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
 bin/qemu-system-mips
+bin/qemu-system-mipsel
 bin/qemu-system-ppc
 bin/qemu-system-sparc
 bin/qemu-system-x86_64
-man/man1/qemu-img.1
-man/man1/qemu.1
 share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/qemu-doc.html
-share/doc/qemu/qemu-tech.html
 share/qemu/bios.bin
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index b98b58e67e3..84e5ae8a899 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.19 2006/01/06 09:17:03 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2006/05/06 18:09:53 xtraeme Exp $
 
-SHA1 (qemu-0.8.0.tar.gz) = f7bcf2f0eee9e5207cba265f3c47ae781244628e
-RMD160 (qemu-0.8.0.tar.gz) = 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7
-Size (qemu-0.8.0.tar.gz) = 1497965 bytes
+SHA1 (qemu-0.8.1.tar.gz) = 72c943c24bed6aa066dcc3012b198c20f04aef30
+RMD160 (qemu-0.8.1.tar.gz) = 04d163d4792bbea39fc0b1e52af124cdb7e907dc
+Size (qemu-0.8.1.tar.gz) = 1623264 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 449195421ad1dbb2592f694d1c4b80f2ea35113c
-SHA1 (patch-ac) = 60dce2f65065d1c2ccc1121ca2b001eec7a73bfc
+SHA1 (patch-ac) = e13af23b0a865a58e87fed9e1856a53ce33d331e
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
 SHA1 (patch-ag) = 86df0bb94e71d87cf61d19404b53e3572384874e
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
-SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
-SHA1 (patch-ak) = 0153a85109baa2314dc53d6cbbacb98b0c517099
+SHA1 (patch-aj) = a177cd01c32732321d8473d5e5f4489e433fbf8f
+SHA1 (patch-ak) = 2cef84d1d6ead0e8aed3f683001a9772d6cb9ae5
 SHA1 (patch-al) = 440b2ad677fd42dd667035dde13b08ab658be867
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
 SHA1 (patch-ap) = 6cd565b9a3b06aea12fbedb1199e16dd0f3577ae
 SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
-SHA1 (patch-au) = aa2712c382a67beef9225e710e7735ba15995a41
-SHA1 (patch-av) = bd88088f41b6b3c256eec933e5f267fc432e58fa
+SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
 SHA1 (patch-ay) = b1a2c96012cc24c3818f1c494eadbbd9968ea085
diff --git a/emulators/qemu/patches/patch-ac b/emulators/qemu/patches/patch-ac
index 77d0ed15955..44dcf1dae86 100644
--- a/emulators/qemu/patches/patch-ac
+++ b/emulators/qemu/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2006/01/02 12:19:52 blymn Exp $
+$NetBSD: patch-ac,v 1.6 2006/05/06 18:09:53 xtraeme Exp $
 
---- vl.c.orig	2005-12-20 09:21:53.000000000 +1030
-+++ vl.c
+--- vl.c.orig	2006-05-06 19:22:32.000000000 +0200
++++ vl.c	2006-05-06 19:28:25.000000000 +0200
 @@ -34,7 +34,11 @@
  #include <sys/times.h>
  #include <sys/wait.h>
@@ -14,27 +14,16 @@ $NetBSD: patch-ac,v 1.5 2006/01/02 12:19:52 blymn Exp $
  #include <sys/mman.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
-@@ -44,8 +48,10 @@
+@@ -43,7 +47,7 @@
+ #include <netdb.h>
  #ifdef _BSD
  #include <sys/stat.h>
- #ifndef __APPLE__
+-#ifndef __APPLE__
 +#ifndef _BSD
  #include <libutil.h>
  #endif
-+#endif
  #else
- #include <linux/if.h>
- #include <linux/if_tun.h>
-@@ -70,7 +76,7 @@
- 
- #ifdef CONFIG_SDL
- #ifdef __APPLE__
--#include <SDL/SDL.h>
-+#include <SDL.h>
- #endif
- #endif /* CONFIG_SDL */
- 
-@@ -1388,7 +1394,7 @@ CharDriverState *qemu_chr_open_stdio(voi
+@@ -1506,7 +1510,7 @@
      return chr;
  }
  
@@ -43,17 +32,17 @@ $NetBSD: patch-ac,v 1.5 2006/01/02 12:19:52 blymn Exp $
  CharDriverState *qemu_chr_open_pty(void)
  {
      struct termios tty;
-@@ -1545,6 +1551,9 @@ CharDriverState *qemu_chr_open_tty(const
+@@ -1663,6 +1667,9 @@
  
  static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
  {
 +#ifdef __NetBSD__
-+	return -ENOTSUP;
++    return ENOTSUP;
 +#else
      int fd = (int)chr->opaque;
      uint8_t b;
  
-@@ -1578,10 +1587,14 @@ static int pp_ioctl(CharDriverState *chr
+@@ -1696,10 +1703,14 @@
          return -ENOTSUP;
      }
      return 0;
@@ -63,12 +52,12 @@ $NetBSD: patch-ac,v 1.5 2006/01/02 12:19:52 blymn Exp $
  CharDriverState *qemu_chr_open_pp(const char *filename)
  {
 +#ifdef __NetBSD__
-+	return NULL;
++    return NULL;
 +#else
      CharDriverState *chr;
      int fd;
  
-@@ -1604,6 +1617,7 @@ CharDriverState *qemu_chr_open_pp(const 
+@@ -1722,6 +1733,7 @@
      chr->chr_add_read_handler = null_chr_add_read_handler;
      chr->chr_ioctl = pp_ioctl;
      return chr;
diff --git a/emulators/qemu/patches/patch-aj b/emulators/qemu/patches/patch-aj
index f14c0fc5909..8389c2911c8 100644
--- a/emulators/qemu/patches/patch-aj
+++ b/emulators/qemu/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.4 2005/05/25 18:04:57 dbj Exp $
+$NetBSD: patch-aj,v 1.5 2006/05/06 18:09:53 xtraeme Exp $
 
---- Makefile.target.orig	Wed Apr 27 16:52:05 2005
-+++ Makefile.target	Wed May 25 11:39:47 2005
-@@ -14,9 +14,9 @@
+--- Makefile.target.orig	2006-05-06 19:30:04.000000000 +0200
++++ Makefile.target	2006-05-06 19:31:21.000000000 +0200
+@@ -17,9 +17,9 @@
  VPATH+=:$(SRC_PATH)/linux-user
  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
  endif
@@ -14,7 +14,7 @@ $NetBSD: patch-aj,v 1.4 2005/05/25 18:04:57 dbj Exp $
  LIBS=
  HELPER_CFLAGS=$(CFLAGS)
  DYNGEN=../dyngen$(EXESUF)
-@@ -403,6 +403,9 @@
+@@ -411,6 +411,9 @@
  sdlaudio.o: sdlaudio.c
  	$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
  
@@ -24,11 +24,11 @@ $NetBSD: patch-aj,v 1.4 2005/05/25 18:04:57 dbj Exp $
  depend: $(SRCS)
  	$(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
  
-@@ -463,7 +466,7 @@
+@@ -492,7 +495,7 @@
  
  install: all 
  ifneq ($(PROGS),)
--	install -m 755 -s $(PROGS) "$(bindir)"
+-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
 +	$(BSD_INSTALL_PROGRAM) $(PROGS) "$(bindir)"
  endif
  
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
index 386c00ddb51..b2fc953f020 100644
--- a/emulators/qemu/patches/patch-ak
+++ b/emulators/qemu/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.5 2005/10/23 19:55:59 rillig Exp $
+$NetBSD: patch-ak,v 1.6 2006/05/06 18:09:53 xtraeme Exp $
 
---- Makefile.orig	2005-07-29 18:18:05.000000000 +0200
-+++ Makefile	2005-07-29 18:22:06.000000000 +0200
+--- Makefile.orig	2006-05-06 19:34:25.000000000 +0200
++++ Makefile	2006-05-06 19:37:07.000000000 +0200
 @@ -1,10 +1,10 @@
- -include config-host.mak
+ include config-host.mak
  
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+#CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++#CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
  ifdef CONFIG_DARWIN
  CFLAGS+= -mdynamic-no-pic
  endif
@@ -15,27 +15,30 @@ $NetBSD: patch-ak,v 1.5 2005/10/23 19:55:59 rillig Exp $
  LIBS=
  DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  TOOLS=qemu-img$(EXESUF)
-@@ -54,16 +54,16 @@
+@@ -48,20 +48,20 @@
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
- install: all 
--	mkdir -p "$(bindir)"
--	install -m 755 -s $(TOOLS) "$(bindir)"
--	mkdir -p "$(datadir)"
--	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+ install-doc: $(DOCS)
+-	mkdir -p "$(DESTDIR)$(docdir)"
+-	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
++	$(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(docdir)"
++	$(BSD_INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+ 	mkdir -p "$(DESTDIR)$(mandir)/man1"
+ 	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+ endif
+ 
+ install: all $(if $(BUILD_DOCS),install-doc)
+-	mkdir -p "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+-	mkdir -p "$(DESTDIR)$(datadir)"
 +	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
 +	$(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
 +	$(BSD_INSTALL_DATA_DIR) $(datadir)
-+	$(BSD_INSTALL_DATA) pc-bios/bios.bin pc-bios/vgabios.bin \
-                        pc-bios/vgabios-cirrus.bin \
-                        pc-bios/ppc_rom.bin pc-bios/video.x \
-                        pc-bios/proll.elf \
--                       pc-bios/linux_boot.bin "$(datadir)"
--	mkdir -p "$(docdir)"
--	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
-+                       pc-bios/linux_boot.bin $(datadir)
-+	$(BSD_INSTALL_DATA_DIR) $(docdir)
-+	$(BSD_INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(docdir)"
+ 	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+ 			video.x proll.elf linux_boot.bin; do \
+-		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
++		$(BSD_INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+ 	done
  ifndef CONFIG_WIN32
- 	mkdir -p "$(mandir)/man1"
- 	install qemu.1 qemu-img.1 "$(mandir)/man1"
+ 	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
diff --git a/emulators/qemu/patches/patch-au b/emulators/qemu/patches/patch-au
index 951e6b2e964..6d025e96bdc 100644
--- a/emulators/qemu/patches/patch-au
+++ b/emulators/qemu/patches/patch-au
@@ -1,76 +1,19 @@
-$NetBSD: patch-au,v 1.1 2005/05/03 11:18:47 xtraeme Exp $
+$NetBSD: patch-au,v 1.2 2006/05/06 18:09:53 xtraeme Exp $
 
---- fpu/softfloat-native.h.orig	2005-04-27 22:52:05.000000000 +0200
-+++ fpu/softfloat-native.h	2005-04-29 01:23:27.000000000 +0200
-@@ -36,9 +36,9 @@
- #if defined(_BSD) && !defined(__APPLE__)
- enum {
-     float_round_nearest_even = FP_RN,
--    float_round_down         = FE_RM,
--    float_round_up           = FE_RP,
--    float_round_to_zero      = FE_RZ
-+    float_round_down         = FP_RM,
-+    float_round_up           = FP_RP,
-+    float_round_to_zero      = FP_RZ
- };
- #elif defined(__arm__)
- enum {
-@@ -143,15 +143,15 @@
- }
- INLINE char float32_le_quiet( float32 a, float32 b STATUS_PARAM)
- {
--    return islessequal(a, b);
-+    return __builtin_islessequal(a, b);
- }
- INLINE char float32_lt_quiet( float32 a, float32 b STATUS_PARAM)
- {
--    return isless(a, b);
-+    return __builtin_isless(a, b);
- }
- INLINE char float32_unordered( float32 a, float32 b STATUS_PARAM)
- {
--    return isunordered(a, b);
-+    return __builtin_isunordered(a, b);
+--- fpu/softfloat-native.h.orig	2006-05-03 22:32:58.000000000 +0200
++++ fpu/softfloat-native.h	2006-05-06 19:49:25.000000000 +0200
+@@ -33,6 +33,14 @@
+ #define isunordered(x,y)        unordered(x, y)
+ #endif
  
- }
- char float32_compare( float32, float32 STATUS_PARAM );
-@@ -223,16 +223,16 @@
- }
- INLINE char float64_le_quiet( float64 a, float64 b STATUS_PARAM)
- {
--    return islessequal(a, b);
-+    return __builtin_islessequal(a, b);
- }
- INLINE char float64_lt_quiet( float64 a, float64 b STATUS_PARAM)
- {
--    return isless(a, b);
-+    return __builtin_isless(a, b);
- 
- }
- INLINE char float64_unordered( float64 a, float64 b STATUS_PARAM)
- {
--    return isunordered(a, b);
-+    return __builtin_isunordered(a, b);
- 
- }
- char float64_compare( float64, float64 STATUS_PARAM );
-@@ -304,16 +304,16 @@
- }
- INLINE char floatx80_le_quiet( floatx80 a, floatx80 b STATUS_PARAM)
- {
--    return islessequal(a, b);
-+    return __builtin_islessequal(a, b);
- }
- INLINE char floatx80_lt_quiet( floatx80 a, floatx80 b STATUS_PARAM)
- {
--    return isless(a, b);
-+    return __builtin_isless(a, b);
- 
- }
- INLINE char floatx80_unordered( floatx80 a, floatx80 b STATUS_PARAM)
- {
--    return isunordered(a, b);
-+    return __builtin_isunordered(a, b);
- 
- }
- char floatx80_compare( floatx80, floatx80 STATUS_PARAM );
++#ifdef __NetBSD__
++#define isgreater(x, y)	__builtin_isgreater(x, y)
++#define isgreaterequal(x, y)	__builtin_isgreaterequal(x, y)
++#define isless(x, y)		__builtin_isless(x, y)
++#define islessequal(x, y)	__builtin_islessequal(x, y)
++#define isunordered(x, y)	__builtin_isunordered(x, y)
++#endif
++
+ typedef float float32;
+ typedef double float64;
+ #ifdef FLOATX80
diff --git a/emulators/qemu/patches/patch-av b/emulators/qemu/patches/patch-av
deleted file mode 100644
index df0770e4720..00000000000
--- a/emulators/qemu/patches/patch-av
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-av,v 1.1 2005/05/03 11:18:47 xtraeme Exp $
-
---- fpu/softfloat-native.c.orig	2005-04-27 22:52:05.000000000 +0200
-+++ fpu/softfloat-native.c	2005-05-03 13:08:02.000000000 +0200
-@@ -25,6 +25,8 @@
- #if defined(_BSD)
- #define lrint(d)		((int32_t)rint(d))
- #define llrint(d)		((int64_t)rint(d))
-+#define lrintf(d)		((int32_t)rint(d))
-+#define llrintf(d)		((int64_t)rint(d))
- #endif
- 
- #if defined(__powerpc__)
-@@ -143,11 +145,11 @@
- }
- char float32_compare_quiet( float32 a, float32 b STATUS_PARAM )
- {
--    if (isless(a, b)) {
-+    if (__builtin_isless(a, b)) {
-         return -1;
-     } else if (a == b) {
-         return 0;
--    } else if (isgreater(a, b)) {
-+    } else if (__builtin_isgreater(a, b)) {
-         return 1;
-     } else {
-         return 2;
-@@ -247,11 +249,11 @@
- }
- char float64_compare_quiet( float64 a, float64 b STATUS_PARAM )
- {
--    if (isless(a, b)) {
-+    if (__builtin_isless(a, b)) {
-         return -1;
-     } else if (a == b) {
-         return 0;
--    } else if (isgreater(a, b)) {
-+    } else if (__builtin_isgreater(a, b)) {
-         return 1;
-     } else {
-         return 2;
-@@ -328,11 +330,11 @@
- }
- char floatx80_compare_quiet( floatx80 a, floatx80 b STATUS_PARAM )
- {
--    if (isless(a, b)) {
-+    if (__builtin_isless(a, b)) {
-         return -1;
-     } else if (a == b) {
-         return 0;
--    } else if (isgreater(a, b)) {
-+    } else if (__builtin_isgreater(a, b)) {
-         return 1;
-     } else {
-         return 2;