diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-11-15 11:35:30 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-11-15 11:35:30 +0000 |
commit | fb45ff04c817b6a39f763823eb9af01c22401ada (patch) | |
tree | 4d5fa610dcc217574d740c88a994e73ab7d28435 /emulators | |
parent | 45b7a6b7f85c5722c0af4f4f34bfbfb051caa39d (diff) | |
download | pkgsrc-fb45ff04c817b6a39f763823eb9af01c22401ada.tar.gz |
Update emulators/qemu to 0.6.1.
Changes:
- Mac OS X port (Pierre d'Herbemont)
- Virtual console support
- Better monitor line edition
- New block device layer
- New 'qcow' growable disk image support with AES encryption and
transparent decompression
- VMware 3 and 4 read-only disk image support (untested)
- Support for up to 4 serial ports
- TFTP server support (Magnus Damm)
- Port redirection support in user mode networking
- Support for not executable data sections
- Compressed loop disk image support (Johannes Schindelin)
- Level triggered IRQ fix (aka NE2000 PCI performance fix) (Steve
Wormley)
- Fixed Fedora Core 2 problems (now you can run qemu without any
LD_ASSUME_KERNEL tricks on FC2)
- DHCP fix for Windows (accept DHCPREQUEST alone)
- SPARC system emulation (Blue Swirl)
- Automatic Samba configuration for host file access from Windows.
- '-loadvm' and '-full-screen' options
- ne2000 savevm support (Johannes Schindelin)
- Ctrl-Alt is now the default grab key. Ctrl-Alt-[0-9] switches to
the virtual consoles.
- BIOS floppy fix for NT4 (Mike Nordell, Derek Fawcus, Volker Ruppert)
- Floppy fixes for NT4 and NT5 (Mike Nordell)
- NT4 IDE fixes (Ben Pfaf, Mike Nordell)
- SDL Audio support and SB16 fixes (malc)
- ENTER instruction bug fix (initial patch by Stefan Kisdaroczi)
- VGA font change fix
- VGA read-only CRTC register fix
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/qemu/Makefile | 13 | ||||
-rw-r--r-- | emulators/qemu/PLIST | 7 | ||||
-rw-r--r-- | emulators/qemu/distinfo | 24 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-aa | 40 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ab | 39 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ac | 20 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ad | 13 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ae | 22 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ag | 26 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ak | 19 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-al | 22 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-am | 13 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-an | 83 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ao | 60 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ap | 14 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-aq | 11 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-ar | 11 |
17 files changed, 287 insertions, 150 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 47cd4af1d42..293bb47054a 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ # -DISTNAME= qemu-0.6.0 +DISTNAME= qemu-0.6.1 CATEGORIES= emulators MASTER_SITES= http://fabrice.bellard.free.fr/qemu/ @@ -9,7 +9,6 @@ MAINTAINER= dhowland@users.sourceforge.net HOMEPAGE= http://fabrice.bellard.free.fr/qemu/ COMMENT= CPU emulator using dynamic translation -ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* CONFLICTS+= qemu-bin-* USE_BUILDLINK3= yes @@ -20,5 +19,13 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu +SUBST_CLASSES+= snd +SUBST_STAGE.snd= post-patch +SUBST_FILES.snd= audio/ossaudio.c +SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g" +SUBST_MESSAGE.snd= "Fixing harcoded audio device." + .include "../../devel/SDL/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST index 47f26afcc0d..7a6ca1884e5 100644 --- a/emulators/qemu/PLIST +++ b/emulators/qemu/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ bin/qemu -bin/qemu-mkcow +bin/qemu-img bin/qemu-system-ppc -bin/vmdk2raw +bin/qemu-system-sparc man/man1/qemu-mkcow.1 man/man1/qemu.1 share/doc/qemu/qemu-doc.html @@ -10,6 +10,7 @@ share/doc/qemu/qemu-tech.html share/qemu/bios.bin share/qemu/linux_boot.bin share/qemu/ppc_rom.bin +share/qemu/proll.bin share/qemu/vgabios-cirrus.bin share/qemu/vgabios.bin @dirrm share/qemu diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 6642b718ee7..023c625d6b1 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,15 +1,19 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ -SHA1 (qemu-0.6.0.tar.gz) = e7e8b30704af11eacad521800d4bf08cdbe5a137 -Size (qemu-0.6.0.tar.gz) = 874397 bytes -SHA1 (patch-aa) = 2c288ab638c5fea542c10ad6b5f23d8f6d011080 -SHA1 (patch-ab) = 4c22f01fedddad7b7095f066e3d190c769648c19 -SHA1 (patch-ac) = 1a963d654984b9aa074f68c44e996f0ed4f86769 -SHA1 (patch-ad) = aa6df3ce9f70687f05141b504ad5d793510f2ed8 -SHA1 (patch-ae) = 70685c894298911028b72651fbe17622c39b1cb0 +SHA1 (qemu-0.6.1.tar.gz) = 6f547082857068a3fbbac5a3d1910776d3c4b2bb +Size (qemu-0.6.1.tar.gz) = 1010121 bytes +SHA1 (patch-aa) = ea16d58a6f6938432cd7ffdd745e57ff3e8bbe53 +SHA1 (patch-ac) = 2f16687e2051934a79e32e3822ee31885aa8a244 SHA1 (patch-af) = 0ef3779e75f48e5a3b735a3cc94e5f5b753f61b3 -SHA1 (patch-ag) = 61783907cc301670e4c55207eb1ea768f6a015b8 +SHA1 (patch-ag) = a2cb1bbf450e4868a0b72216e5719559b2fd33bd SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf SHA1 (patch-aj) = 5917569d9d5e2bfc0f8d47522fc39efade6f8dd9 -SHA1 (patch-ak) = 9309fb1386e746f12d03f9caa16b880247552410 +SHA1 (patch-ak) = 7dcdbf4d010c656b8ace2d41651a18d63404e9e8 +SHA1 (patch-al) = d87d8c4bd0a422b0e1c2b52d049e9ac807cf1375 +SHA1 (patch-am) = b12f4ed6bbeb4d89c43ca06b3b3ff25c14386c47 +SHA1 (patch-an) = 10e1c5edae487be4ae43648649ad419a3b6d7508 +SHA1 (patch-ao) = 1899c03e37b2409df13c6f69bb21c3debf0aa4e8 +SHA1 (patch-ap) = cffb474805403056706d06d4a2f01e1984cb1edf +SHA1 (patch-aq) = a0fe72cfbc54086feeb5a554220df6fdc2aa063e +SHA1 (patch-ar) = 2ea46ba9c333fd2e90b98dc7666bafa8c3082d42 diff --git a/emulators/qemu/patches/patch-aa b/emulators/qemu/patches/patch-aa index 7d077c0e669..4580f835d37 100644 --- a/emulators/qemu/patches/patch-aa +++ b/emulators/qemu/patches/patch-aa @@ -1,40 +1,26 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ ---- bswap.h.orig 2004-07-10 21:20:09.000000000 +0300 -+++ bswap.h -@@ -4,11 +4,13 @@ - #include "config-host.h" +--- bswap.h.orig 2004-11-15 12:19:31.000000000 +0100 ++++ bswap.h 2004-11-15 12:20:25.000000000 +0100 +@@ -5,6 +5,12 @@ #include <inttypes.h> + ++#ifdef _BSD ++#include <sys/endian.h> +#include <sys/types.h> +#include <machine/bswap.h> - ++#else ++ #ifdef HAVE_BYTESWAP_H #include <byteswap.h> #else -- -+/* - #define bswap_16(x) \ - ({ \ - uint16_t __x = (x); \ -@@ -40,9 +42,9 @@ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \ - }) -- -+*/ - #endif /* !HAVE_BYTESWAP_H */ -- -+/* - static inline uint16_t bswap16(uint16_t x) - { - return bswap_16(x); -@@ -57,7 +59,7 @@ static inline uint64_t bswap64(uint64_t - { +@@ -58,6 +64,8 @@ return bswap_64(x); } -- -+*/ + ++#endif /* ! _BSD */ ++ static inline void bswap16s(uint16_t *s) { *s = bswap16(*s); diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab deleted file mode 100644 index 296b2afdafe..00000000000 --- a/emulators/qemu/patches/patch-ab +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ - ---- vmdk2raw.c.orig 2004-07-10 21:20:09.000000000 +0300 -+++ vmdk2raw.c -@@ -84,7 +84,9 @@ static size_t copy_virtual(struct vmdk_p - unsigned int granule_offset; - unsigned int grain_index; - unsigned int sector_map_idx; -- -+ -+ const char nil = 0; -+ - granule_offset = offset % granule_size; - length = MIN(length, granule_size - granule_offset); - length = MIN(length, disk_limit - offset); -@@ -132,7 +134,6 @@ zero_fill: - if (lseek64(out_fd, length-1, SEEK_CUR) == (off_t)-1) - perror("lseek"); - /* write the last NULL byte instead of seeking */ -- const char nil = 0; - write(out_fd, &nil, 1); - } else { - if (lseek64(out_fd, length, SEEK_CUR) == (off_t)-1) -@@ -185,13 +186,14 @@ static int open_vmdk3(int fd) - - static int open_vmdk(const char *filename) - { -+ char magic[4]; -+ - int fd = open(filename, O_RDONLY | O_LARGEFILE); - if (fd == -1) { - perror(filename); - return -1; - } - -- char magic[4]; - if (read(fd, &magic, sizeof(magic)) != sizeof(magic)) { - perror("read from disk"); - return -1; diff --git a/emulators/qemu/patches/patch-ac b/emulators/qemu/patches/patch-ac index 7cca0379b45..7daa1b21058 100644 --- a/emulators/qemu/patches/patch-ac +++ b/emulators/qemu/patches/patch-ac @@ -1,17 +1,15 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ ---- vl.c.orig 2004-07-10 21:20:09.000000000 +0300 -+++ vl.c -@@ -40,9 +40,9 @@ - #include <sys/socket.h> +--- vl.c.orig 2004-11-15 12:04:03.000000000 +0100 ++++ vl.c 2004-11-15 12:04:17.000000000 +0100 +@@ -43,8 +43,10 @@ #ifdef _BSD #include <sys/stat.h> --#ifndef __APPLE__ --#include <libutil.h> --#endif -+//#ifndef __APPLE__ -+//#include <libutil.h> -+//#endif + #ifndef __APPLE__ ++#ifndef _BSD + #include <libutil.h> + #endif ++#endif #else #include <linux/if.h> #include <linux/if_tun.h> diff --git a/emulators/qemu/patches/patch-ad b/emulators/qemu/patches/patch-ad deleted file mode 100644 index f83b60e53d0..00000000000 --- a/emulators/qemu/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ - ---- oss.c.orig 2004-07-10 21:20:09.000000000 +0300 -+++ oss.c -@@ -23,7 +23,7 @@ - */ - #include "vl.h" - --#if !defined(_WIN32) && !defined(__APPLE__) -+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(_BSD) - #include <ctype.h> - #include <fcntl.h> - #include <errno.h> diff --git a/emulators/qemu/patches/patch-ae b/emulators/qemu/patches/patch-ae deleted file mode 100644 index 29ac70a9d80..00000000000 --- a/emulators/qemu/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ - ---- slirp/slirp_config.h.orig 2004-07-10 21:20:09.000000000 +0300 -+++ slirp/slirp_config.h -@@ -61,7 +61,7 @@ - #define HAVE_STDLIB_H - - /* Define if you have sys/ioctl.h */ --#undef HAVE_SYS_IOCTL_H -+#define HAVE_SYS_IOCTL_H - - /* Define if you have sys/filio.h */ - #undef HAVE_SYS_FILIO_H -@@ -162,7 +162,7 @@ - #define HAVE_MEMMOVE - - /* Define if you have <termios.h> */ --#undef HAVE_TERMIOS_H -+#define HAVE_TERMIOS_H - - /* Define if you have gethostid */ - #undef HAVE_GETHOSTID diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag index 21f56a49ee6..0162a544d5b 100644 --- a/emulators/qemu/patches/patch-ag +++ b/emulators/qemu/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ +$NetBSD: patch-ag,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ ---- configure.orig 2004-07-10 21:20:09.000000000 +0300 -+++ configure -@@ -241,7 +241,7 @@ aa="no" +--- configure.orig 2004-11-15 11:51:55.000000000 +0100 ++++ configure 2004-11-15 11:53:18.000000000 +0100 +@@ -259,7 +259,7 @@ `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes" sdl_static_libs=`$sdl_config --static-libs` if [ "$aa" = "yes" ] ; then @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ fi if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then -@@ -293,7 +293,7 @@ else +@@ -314,7 +314,7 @@ if test -z "$prefix" ; then prefix="/usr/local" fi @@ -20,12 +20,12 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ datadir="$prefix/share/qemu" docdir="$prefix/share/doc/qemu" bindir="$prefix/bin" -@@ -529,7 +529,7 @@ if test "$target_user_only" = "no"; then +@@ -566,7 +566,7 @@ + fi + echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak + if [ "${aa}" = "yes" ] ; then +- echo -n " `aalib-config --cflags`" >> $config_mak ; ++ echo -n " `aalib-x11-config --cflags`" >> $config_mak ; + fi + echo "" >> $config_mak fi - echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak - if [ "${aa}" = "yes" ] ; then -- echo -n " `aalib-config --cflags`" >> $config_mak ; -+ echo -n " `aalib-x11-config --cflags`" >> $config_mak ; - fi - echo "" >> $config_mak - fi diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak index f940092e9e5..2a6138bfe97 100644 --- a/emulators/qemu/patches/patch-ak +++ b/emulators/qemu/patches/patch-ak @@ -1,12 +1,12 @@ -$NetBSD: patch-ak,v 1.1.1.1 2004/11/09 13:05:35 xtraeme Exp $ +$NetBSD: patch-ak,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ ---- Makefile.orig 2004-11-09 13:24:28.000000000 +0100 -+++ Makefile 2004-11-09 13:25:58.000000000 +0100 +--- Makefile.orig 2004-11-15 11:54:34.000000000 +0100 ++++ Makefile 2004-11-15 11:56:25.000000000 +0100 @@ -1,13 +1,13 @@ - include config-host.mak + -include config-host.mak --CFLAGS=-Wall -O2 -g -+#CFLAGS=-Wall -O2 -g +-CFLAGS=-Wall -O2 -g -fno-strict-aliasing ++#CFLAGS=-Wall -O2 -g -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -16,9 +16,9 @@ $NetBSD: patch-ak,v 1.1.1.1 2004/11/09 13:05:35 xtraeme Exp $ -LDFLAGS=-g +#LDFLAGS=-g LIBS= - DEFINES+=-D_GNU_SOURCE - ifndef CONFIG_WIN32 -@@ -47,17 +47,17 @@ + DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + TOOLS=qemu-img +@@ -43,18 +43,18 @@ done install: all @@ -33,6 +33,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2004/11/09 13:05:35 xtraeme Exp $ + $(BSD_INSTALL_DATA) pc-bios/bios.bin pc-bios/vgabios.bin \ pc-bios/vgabios-cirrus.bin \ pc-bios/ppc_rom.bin \ + pc-bios/proll.bin \ - pc-bios/linux_boot.bin "$(datadir)" - mkdir -p "$(docdir)" - install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" diff --git a/emulators/qemu/patches/patch-al b/emulators/qemu/patches/patch-al new file mode 100644 index 00000000000..75939d164e1 --- /dev/null +++ b/emulators/qemu/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- osdep.h.orig 2004-11-15 12:01:18.000000000 +0100 ++++ osdep.h 2004-11-15 12:01:55.000000000 +0100 +@@ -2,6 +2,8 @@ + #define QEMU_OSDEP_H + + #include <stdarg.h> ++#include <sys/types.h> ++#include <sys/signal.h> + + int qemu_vsnprintf(char *buf, int buflen, const char *fmt, va_list args); + void qemu_vprintf(const char *fmt, va_list ap); +@@ -28,7 +30,7 @@ + struct qemu_sigaction { + union { + void (*_sa_handler)(int); +- void (*_sa_sigaction)(int, struct siginfo *, void *); ++ void (*_sa_sigaction)(int, siginfo_t *, void *); + } _u; + unsigned long sa_flags; + void (*sa_restorer)(void); diff --git a/emulators/qemu/patches/patch-am b/emulators/qemu/patches/patch-am new file mode 100644 index 00000000000..9a9b7e861a4 --- /dev/null +++ b/emulators/qemu/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- audio/ossaudio.c.orig 2004-11-15 12:07:01.000000000 +0100 ++++ audio/ossaudio.c 2004-11-15 12:07:55.000000000 +0100 +@@ -164,7 +164,7 @@ + goto err; + } + +- if (ioctl (fd, SNDCTL_DSP_NONBLOCK)) { ++ if (ioctl (fd, SNDCTL_DSP_NONBLOCK, NULL)) { + dolog ("Could not initialize audio hardware\n" + "Failed to set non-blocking mode\n" + "Reason: %s\n", diff --git a/emulators/qemu/patches/patch-an b/emulators/qemu/patches/patch-an new file mode 100644 index 00000000000..5840cc26361 --- /dev/null +++ b/emulators/qemu/patches/patch-an @@ -0,0 +1,83 @@ +$NetBSD: patch-an,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- audio/mixeng_template.h 7 Nov 2004 18:04:02 -0000 1.1 ++++ audio/mixeng_template.h 15 Nov 2004 09:09:27 -0000 +@@ -35,7 +35,7 @@ + #define HALF HALFT + #endif + +-static int64_t inline glue(conv_,IN_T) (IN_T v) ++static int64_t inline CONV_IN_T (IN_T v) + { + #ifdef SIGNED + return (INT_MAX*(int64_t)v)/HALF; +@@ -44,7 +44,7 @@ + #endif + } + +-static IN_T inline glue(clip_,IN_T) (int64_t v) ++static IN_T inline CLIP_IN_T (int64_t v) + { + if (v >= INT_MAX) + return IN_MAX; +@@ -58,50 +58,50 @@ + #endif + } + +-static void glue(glue(conv_,IN_T),_to_stereo) (void *dst, const void *src, ++static void glue(CONV_IN_T,_to_stereo) (void *dst, const void *src, + int samples) + { + st_sample_t *out = (st_sample_t *) dst; + IN_T *in = (IN_T *) src; + while (samples--) { +- out->l = glue(conv_,IN_T) (*in++); +- out->r = glue(conv_,IN_T) (*in++); ++ out->l = CONV_IN_T (*in++); ++ out->r = CONV_IN_T (*in++); + out += 1; + } + } + +-static void glue(glue(conv_,IN_T),_to_mono) (void *dst, const void *src, ++static void glue(CONV_IN_T,_to_mono) (void *dst, const void *src, + int samples) + { + st_sample_t *out = (st_sample_t *) dst; + IN_T *in = (IN_T *) src; + while (samples--) { +- out->l = glue(conv_,IN_T) (in[0]); ++ out->l = CONV_IN_T (in[0]); + out->r = out->l; + out += 1; + in += 1; + } + } + +-static void glue(glue(clip_,IN_T),_from_stereo) (void *dst, const void *src, ++static void glue(CLIP_IN_T,_from_stereo) (void *dst, const void *src, + int samples) + { + st_sample_t *in = (st_sample_t *) src; + IN_T *out = (IN_T *) dst; + while (samples--) { +- *out++ = glue(clip_,IN_T) (in->l); +- *out++ = glue(clip_,IN_T) (in->r); ++ *out++ = CLIP_IN_T (in->l); ++ *out++ = CLIP_IN_T (in->r); + in += 1; + } + } + +-static void glue(glue(clip_,IN_T),_from_mono) (void *dst, const void *src, ++static void glue(CLIP_IN_T,_from_mono) (void *dst, const void *src, + int samples) + { + st_sample_t *in = (st_sample_t *) src; + IN_T *out = (IN_T *) dst; + while (samples--) { +- *out++ = glue(clip_,IN_T) (in->l + in->r); ++ *out++ = CLIP_IN_T (in->l + in->r); + in += 1; + } + } diff --git a/emulators/qemu/patches/patch-ao b/emulators/qemu/patches/patch-ao new file mode 100644 index 00000000000..e2a0610f3b6 --- /dev/null +++ b/emulators/qemu/patches/patch-ao @@ -0,0 +1,60 @@ +$NetBSD: patch-ao,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- audio/mixeng.c 7 Nov 2004 18:04:02 -0000 1.1 ++++ audio/mixeng.c 15 Nov 2004 09:09:27 -0000 +@@ -27,6 +27,8 @@ + #include "audio/mixeng.h" + + #define IN_T int8_t ++#define CONV_IN_T conv_int8_t ++#define CLIP_IN_T clip_int8_t + #define IN_MIN CHAR_MIN + #define IN_MAX CHAR_MAX + #define SIGNED +@@ -34,17 +36,25 @@ + #undef SIGNED + #undef IN_MAX + #undef IN_MIN ++#undef CLIP_IN_T ++#undef CONV_IN_T + #undef IN_T + + #define IN_T uint8_t ++#define CONV_IN_T conv_uint8_t ++#define CLIP_IN_T clip_uint8_t + #define IN_MIN 0 + #define IN_MAX UCHAR_MAX + #include "mixeng_template.h" + #undef IN_MAX + #undef IN_MIN ++#undef CLIP_IN_T ++#undef CONV_IN_T + #undef IN_T + + #define IN_T int16_t ++#define CONV_IN_T conv_int16_t ++#define CLIP_IN_T clip_int16_t + #define IN_MIN SHRT_MIN + #define IN_MAX SHRT_MAX + #define SIGNED +@@ -52,14 +62,20 @@ + #undef SIGNED + #undef IN_MAX + #undef IN_MIN ++#undef CLIP_IN_T ++#undef CONV_IN_T + #undef IN_T + + #define IN_T uint16_t ++#define CONV_IN_T conv_uint16_t ++#define CLIP_IN_T clip_uint16_t + #define IN_MIN 0 + #define IN_MAX USHRT_MAX + #include "mixeng_template.h" + #undef IN_MAX + #undef IN_MIN ++#undef CLIP_IN_T ++#undef CONV_IN_T + #undef IN_T + + t_sample *mixeng_conv[2][2][2] = { diff --git a/emulators/qemu/patches/patch-ap b/emulators/qemu/patches/patch-ap new file mode 100644 index 00000000000..c4fe829f41d --- /dev/null +++ b/emulators/qemu/patches/patch-ap @@ -0,0 +1,14 @@ +$NetBSD: patch-ap,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- target-sparc/cpu.h 9 Oct 2004 18:08:01 -0000 1.8 ++++ target-sparc/cpu.h 15 Nov 2004 09:09:31 -0000 +@@ -145,8 +145,7 @@ + int cpu_sparc_exec(CPUSPARCState *s); + int cpu_sparc_close(CPUSPARCState *s); + +-struct siginfo; +-int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc); ++int cpu_sparc_signal_handler(int hostsignum, siginfo_t *info, void *puc); + + #define TARGET_PAGE_BITS 12 /* 4k */ + #include "cpu-all.h" diff --git a/emulators/qemu/patches/patch-aq b/emulators/qemu/patches/patch-aq new file mode 100644 index 00000000000..6c0da2489cf --- /dev/null +++ b/emulators/qemu/patches/patch-aq @@ -0,0 +1,11 @@ +$NetBSD: patch-aq,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- target-sparc/exec.h 12 Oct 2004 22:01:28 -0000 1.6 ++++ target-sparc/exec.h 15 Nov 2004 09:09:31 -0000 +@@ -1,5 +1,6 @@ + #ifndef EXEC_SPARC_H + #define EXEC_SPARC_H 1 ++#include "config.h" + #include "dyngen-exec.h" + + register struct CPUSPARCState *env asm(AREG0); diff --git a/emulators/qemu/patches/patch-ar b/emulators/qemu/patches/patch-ar new file mode 100644 index 00000000000..51d4f86f41f --- /dev/null +++ b/emulators/qemu/patches/patch-ar @@ -0,0 +1,11 @@ +$NetBSD: patch-ar,v 1.1 2004/11/15 11:35:30 xtraeme Exp $ + +--- target-sparc/op_helper.c 10 Oct 2004 17:46:24 -0000 1.3 ++++ target-sparc/op_helper.c 15 Nov 2004 09:09:31 -0000 +@@ -1,5 +1,4 @@ + #include <math.h> +-#include <fenv.h> + #include "exec.h" + + #ifdef USE_INT_TO_FLOAT_HELPERS + |