pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: [PATCH] update qemu to 0.9.1



Updated patchset ... seems to work in DragonFly BSD and NetBSD 4

Rumko wrote:
> The updated patchset (attaches) fixes this problem ...
> but there's another ... when compiling hw/wm8750.c ... complains about a few
> things including a syntax error before QEMUSoundCard ... I have yet to figure
> out how to fix this (even tried raising GCC_REQD to 3.4, but it didnt change
> a thing, so it seems it's not an error caused by the compiler).
> 
> Jeremy C. Reed wrote:
>> Using your 0.9.1 update patch on NetBSD 4.0_RC4 on amd64 fails with:
>> 
>> tx:qemu$ make
>> => Bootstrap dependency digest>=20010302: found digest-20070803
>> => Bootstrap dependency checkperms>=1.1: found checkperms-1.10
>> ===> Checking for vulnerabilities in qemu-0.9.1
>> ===> Building for qemu-0.9.1
>> gcc -O2 -I/usr/pkg/include -DGLX_GLXEXT_LEGACY -I/usr/include -Wall -O2 -g
>> -fno-strict-aliasing -I/usr/pkg/include -DGLX_GLXEXT_LEGACY -I/usr/include
>> -I. -I/usr/pkgsrc/emulators/qemu/work/qemu-0.9.1 -MMD -MP -D_GNU_SOURCE
>> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>> -I/usr/pkgsrc/emulators/qemu/work/qemu-0.9.1/slirp    -c -o qemu-img.o
>> qemu-img.c
>> In file included from qemu-common.h:58,
>>                  from qemu-img.c:24:
>> bswap.h:52: error: syntax error before '(' token
>> bswap.h:54: error: syntax error before "__uint16_t"
>> bswap.h:57: error: syntax error before '(' token
>> bswap.h:59: error: syntax error before "__uint32_t"
>> bswap.h:62: error: syntax error before '(' token
>> bswap.h:64: error: syntax error before "__uint64_t"
>> gmake: *** [qemu-img.o] Error 1
>> *** Error code 2
>> 
>> Stop.
>> make: stopped in /usr/pkgsrc/emulators/qemu
>> *** Error code 1
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile    24 Dec 2007 10:18:22 -0000      1.50
+++ Makefile    18 Jan 2008 12:25:10 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.50 2007/12/24 10:18:22 apb Exp $
 #
 
-DISTNAME=              qemu-0.9.0
-PKGREVISION=           1
+DISTNAME=              qemu-0.9.1
 CATEGORIES=            emulators
 MASTER_SITES=          http://fabrice.bellard.free.fr/qemu/
 
@@ -50,11 +49,6 @@
 # to build in the SSE code.
 BUILDLINK_TRANSFORM+=  rm-optarg:-march rm-optarg:-mcpu rm:-msse rm:-msse2
 
-# Does not build with the stack protector
-.if ${OPSYS} == "DragonFly"
-CFLAGS+=               -fno-stack-protector
-.endif
-
 .include "../../mk/compiler.mk"
 
 .if !empty(CC_VERSION:Mgcc-4*)
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/distinfo,v
retrieving revision 1.37
diff -u -r1.37 distinfo
--- distinfo    4 Jan 2008 21:37:07 -0000       1.37
+++ distinfo    18 Jan 2008 12:25:10 -0000
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.37 2008/01/04 21:37:07 sborrill Exp $
+$NetBSD$
 
-SHA1 (qemu-0.9.0.tar.gz) = 1e57e48a06eb8729913d92601000466eecef06cb
-RMD160 (qemu-0.9.0.tar.gz) = 4296542b6da18a6ac93d20787330d3c1c2ac0a19
-Size (qemu-0.9.0.tar.gz) = 1901741 bytes
-SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ab) = 29870b0bec5f9fa08267dfb9208d75d1d735714a
-SHA1 (patch-ac) = f3f37f2e72de28077a6579b12ecb2ea6650eea85
+SHA1 (qemu-0.9.1.tar.gz) = 630ea20b5989f0df00128de7f7be661c573ed041
+RMD160 (qemu-0.9.1.tar.gz) = ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5
+Size (qemu-0.9.1.tar.gz) = 2804104 bytes
+SHA1 (patch-aa) = dc760f57a99cb5826c48aefe357d85c595160bd2
+SHA1 (patch-ab) = 5e7f00bc3a819e1ccd744dce3dc1a04f33eed75f
+SHA1 (patch-ac) = 0f26ee4336ec3f978381b2e388d9c4cf5d86ff74
 SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
-SHA1 (patch-ag) = 792b409e5d737fb1a82d319ab6bdaefae84e05a4
-SHA1 (patch-ak) = 11669ec0ac62c0c90b7d2bfecb1f6efe3cb82fd2
+SHA1 (patch-ae) = 9a85a166aee46403fd202d93c28caf2057f574be
+SHA1 (patch-ag) = ce7669451ab8c8b8f4effb94c639bf73df485322
+SHA1 (patch-ak) = c49da192a555504a5d581123141d9e2e400bea9a
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
-SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
-SHA1 (patch-au) = 8dec416dcff966ecf23bd8cb7904ab5bed22d08a
+SHA1 (patch-ao) = bf3b6f22467e22ae1b742e53a09bc2b72acdc1f6
+SHA1 (patch-au) = 8771cdfb86344f98faa5d49ddc27d42b07a698b2
 SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
-SHA1 (patch-aw) = 3b1472a95a2312f9e49ea1a6aa517ad81328324c
+SHA1 (patch-aw) = 10b1beafafe6eed395cadca7f90f94efaaaa1b7f
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = 2d3051685878abe077abdbba9681bd04e04c7fb3
+SHA1 (patch-ay) = bcaa56a48af0a47260bdde5ca79c4478d24e80f4
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa    14 Dec 2004 01:02:19 -0000      1.3
+++ patches/patch-aa    18 Jan 2008 12:25:10 -0000
@@ -2,7 +2,7 @@
 
 --- bswap.h.orig       Sun Nov 14 15:51:33 2004
 +++ bswap.h
-@@ -5,6 +5,12 @@
+@@ -5,6 +5,14 @@
  
  #include <inttypes.h>
  
@@ -10,12 +10,14 @@
 +#include <sys/endian.h>
 +#include <sys/types.h>
 +#include <machine/bswap.h>
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
 +#else
 +
  #ifdef HAVE_BYTESWAP_H
  #include <byteswap.h>
  #else
-@@ -57,6 +63,8 @@ static inline uint64_t bswap64(uint64_t 
+@@ -57,6 +65,8 @@ static inline uint64_t bswap64(uint64_t 
  {
      return bswap_64(x);
  }
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ab,v
retrieving revision 1.8
diff -u -r1.8 patch-ab
--- patches/patch-ab    30 Dec 2007 17:12:44 -0000      1.8
+++ patches/patch-ab    18 Jan 2008 12:25:10 -0000
@@ -2,27 +2,14 @@
 
 --- Makefile.target.orig       2007-02-05 23:01:54 +0000
 +++ Makefile.target
-@@ -72,6 +72,10 @@ endif
+@@ -99,6 +99,10 @@ endif
  # We require -O2 to avoid the stack setup prologue in EXIT_TB
- OP_CFLAGS = -Wall -O2 -g -fno-strict-aliasing
+ OP_CFLAGS := -Wall -O2 -g -fno-strict-aliasing
  
 +ifdef STACK_PROTECTOR_PRESENT
 +OP_CFLAGS += -fno-stack-protector
 +endif
 +
- ifeq ($(ARCH),i386)
- HELPER_CFLAGS+=-fomit-frame-pointer
- OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
-@@ -440,10 +444,12 @@ endif
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
-+ifndef CONFIG_DRAGONFLY
- VL_LIBS=-lutil -lrt
- endif
- endif
- endif
-+endif
- ifdef TARGET_GPROF
- vl.o: BASE_CFLAGS+=-p
- VL_LDFLAGS+=-p
+ # cc-option
+ # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, 
-malign-functions=0)
+ 
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ac,v
retrieving revision 1.9
diff -u -r1.9 patch-ac
--- patches/patch-ac    18 Dec 2007 00:16:56 -0000      1.9
+++ patches/patch-ac    18 Jan 2008 12:25:10 -0000
@@ -2,26 +2,17 @@
 
 --- vl.c.orig  2007-05-02 01:56:26.000000000 +0200
 +++ vl.c       2007-05-02 01:57:42.000000000 +0200
-@@ -44,7 +44,7 @@
- #include <netdb.h>
- #ifdef _BSD
- #include <sys/stat.h>
--#ifndef __APPLE__
-+#ifndef _BSD
- #include <libutil.h>
- #endif
- #else
-@@ -1801,6 +1801,9 @@
+@@ -2385,6 +2385,9 @@
  
  static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
  {
 +#ifdef __NetBSD__
 +    return ENOTSUP;
 +#endif
-     int fd = (int)chr->opaque;
+     ParallelCharDriver *drv = chr->opaque;
+     int fd = drv->fd;
      uint8_t b;
- 
-@@ -1838,6 +1841,9 @@
+@@ -2473,6 +2476,9 @@
  
  static CharDriverState *qemu_chr_open_pp(const char *filename)
  {
@@ -29,5 +20,5 @@
 +    return ENOTSUP;
 +#endif
      CharDriverState *chr;
+     ParallelCharDriver *drv;
      int fd;
- 
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae    18 Jan 2008 12:25:11 -0000
@@ -0,0 +1,119 @@
+$NetBSD$
+
+--- hw/slavio_serial.c.orig    2008-01-15 17:25:29 +0100
++++ hw/slavio_serial.c 2008-01-15 17:25:30 +0100
+@@ -215,7 +215,6 @@
+ static void handle_kbd_command(ChannelState *s, int val);
+ static int serial_can_receive(void *opaque);
+ static void serial_receive_byte(ChannelState *s, int ch);
+-static inline void set_txint(ChannelState *s);
+ 
+ static void clear_queue(void *opaque)
+ {
+@@ -321,28 +320,6 @@
+     slavio_serial_reset_chn(&s->chn[1]);
+ }
+ 
+-static inline void clr_rxint(ChannelState *s)
+-{
+-    s->rxint = 0;
+-    s->rxint_under_svc = 0;
+-    if (s->chn == chn_a) {
+-        if (s->wregs[W_MINTR] & MINTR_STATUSHI)
+-            s->otherchn->rregs[R_IVEC] = IVEC_HINOINT;
+-        else
+-            s->otherchn->rregs[R_IVEC] = IVEC_LONOINT;
+-        s->rregs[R_INTR] &= ~INTR_RXINTA;
+-    } else {
+-        if (s->wregs[W_MINTR] & MINTR_STATUSHI)
+-            s->rregs[R_IVEC] = IVEC_HINOINT;
+-        else
+-            s->rregs[R_IVEC] = IVEC_LONOINT;
+-        s->otherchn->rregs[R_INTR] &= ~INTR_RXINTB;
+-    }
+-    if (s->txint)
+-        set_txint(s);
+-    slavio_serial_update_irq(s);
+-}
+-
+ static inline void set_rxint(ChannelState *s)
+ {
+     s->rxint = 1;
+@@ -367,6 +344,49 @@
+     slavio_serial_update_irq(s);
+ }
+ 
++static inline void set_txint(ChannelState *s)
++{
++    s->txint = 1;
++    if (!s->rxint_under_svc) {
++        s->txint_under_svc = 1;
++        if (s->chn == chn_a) {
++            if (s->wregs[W_MINTR] & MINTR_STATUSHI)
++                s->otherchn->rregs[R_IVEC] = IVEC_HITXINTA;
++            else
++                s->otherchn->rregs[R_IVEC] = IVEC_LOTXINTA;
++        } else {
++            s->rregs[R_IVEC] = IVEC_TXINTB;
++        }
++    }
++    if (s->chn == chn_a)
++        s->rregs[R_INTR] |= INTR_TXINTA;
++    else
++        s->otherchn->rregs[R_INTR] |= INTR_TXINTB;
++    slavio_serial_update_irq(s);
++}
++
++static inline void clr_rxint(ChannelState *s)
++{
++    s->rxint = 0;
++    s->rxint_under_svc = 0;
++    if (s->chn == chn_a) {
++        if (s->wregs[W_MINTR] & MINTR_STATUSHI)
++            s->otherchn->rregs[R_IVEC] = IVEC_HINOINT;
++        else
++            s->otherchn->rregs[R_IVEC] = IVEC_LONOINT;
++        s->rregs[R_INTR] &= ~INTR_RXINTA;
++    } else {
++        if (s->wregs[W_MINTR] & MINTR_STATUSHI)
++            s->rregs[R_IVEC] = IVEC_HINOINT;
++        else
++            s->rregs[R_IVEC] = IVEC_LONOINT;
++        s->otherchn->rregs[R_INTR] &= ~INTR_RXINTB;
++    }
++    if (s->txint)
++        set_txint(s);
++    slavio_serial_update_irq(s);
++}
++
+ static inline void clr_txint(ChannelState *s)
+ {
+     s->txint = 0;
+@@ -389,27 +409,6 @@
+     slavio_serial_update_irq(s);
+ }
+ 
+-static inline void set_txint(ChannelState *s)
+-{
+-    s->txint = 1;
+-    if (!s->rxint_under_svc) {
+-        s->txint_under_svc = 1;
+-        if (s->chn == chn_a) {
+-            if (s->wregs[W_MINTR] & MINTR_STATUSHI)
+-                s->otherchn->rregs[R_IVEC] = IVEC_HITXINTA;
+-            else
+-                s->otherchn->rregs[R_IVEC] = IVEC_LOTXINTA;
+-        } else {
+-            s->rregs[R_IVEC] = IVEC_TXINTB;
+-        }
+-    }
+-    if (s->chn == chn_a)
+-        s->rregs[R_INTR] |= INTR_TXINTA;
+-    else
+-        s->otherchn->rregs[R_INTR] |= INTR_TXINTB;
+-    slavio_serial_update_irq(s);
+-}
+-
+ static void slavio_serial_update_parameters(ChannelState *s)
+ {
+     int speed, parity, data_bits, stop_bits;
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ag,v
retrieving revision 1.10
diff -u -r1.10 patch-ag
--- patches/patch-ag    4 Jan 2008 21:37:07 -0000       1.10
+++ patches/patch-ag    18 Jan 2008 12:25:11 -0000
@@ -2,15 +2,6 @@
 
 --- configure.orig     2007-02-05 23:01:54 +0000
 +++ configure
-@@ -29,7 +29,7 @@ ar="ar"
- make="make"
- install="install"
- strip="strip"
--cpu=`uname -m`
-+cpu=`uname -p`
- target_list=""
- case "$cpu" in
-   i386|i486|i586|i686|i86pc|BePC)
 @@ -44,7 +44,7 @@ case "$cpu" in
    alpha)
      cpu="alpha"
@@ -20,7 +11,7 @@
      cpu="powerpc"
    ;;
    mips)
-@@ -116,6 +116,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
+@@ -136,6 +136,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
      kqemu="yes"
  fi
  ;;
@@ -33,7 +24,7 @@
  NetBSD)
  bsd="yes"
  oss="yes"
-@@ -371,6 +377,16 @@ EOF
+@@ -478,6 +484,16 @@ EOF
      fi
  fi
  
@@ -41,7 +32,7 @@
 +cat > $TMPC <<EOF
-+extern int foo;
++int main() {}
 +EOF
-+if "$cc" -o $TMPE $TMPC -fno-stack-protector 2> /dev/null ; then
++if "$cc" -o $TMPE $TMPC -fno-stack-protector 2> /dev/null ; then
 +  stack_protector_present="yes"
 +else
 +  stack_protector_present="no"
@@ -50,28 +41,31 @@
  #
  # Solaris specific configure tool chain decisions
  #
-@@ -573,7 +589,7 @@ else
- if test -z "$prefix" ; then
-     prefix="/usr/local"
- fi
--mandir="$prefix/share/man"
-+mandir="$prefix/$PKGMANDIR"
- datadir="$prefix/share/qemu"
- docdir="$prefix/share/doc/qemu"
- bindir="$prefix/bin"
-@@ -711,6 +727,11 @@ if test "$mingw32" = "yes" ; then
-   echo "#define CONFIG_WIN32 1" >> $config_h
- elif test -f "/usr/include/byteswap.h" ; then
-   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
-+elif test -f "/usr/include/machine/bswap.h" ; then
-+  echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
-+fi
-+if test "$dragonfly" = "yes" ; then
-+  echo "CONFIG_DRAGONFLY=yes" >> $config_mak
+@@ -680,7 +696,7 @@ else
+   if test -z "$prefix" ; then
+       prefix="/usr/local"
+   fi
+-  mansuffix="/share/man"
++  mansuffix="/$PKGMANDIR"
+   datasuffix="/share/qemu"
+   docsuffix="/share/doc/qemu"
+   binsuffix="/bin"
+@@ -848,6 +864,14 @@ if test "$mingw32" = "yes" ; then
+ EOF
+   if $cc -o $TMPE $TMPC 2> /dev/null ; then
+     echo "#define HAVE_BYTESWAP_H 1" >> $config_h
++  else
++    cat > $TMPC << EOF
++#include <machine/bswap.h>
++int main(void) { return bswap32(0); }
++EOF
++    if $cc -o $TMPE $TMPC 2> /dev/null ; then
++      echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
++    fi
+   fi
  fi
  if test "$darwin" = "yes" ; then
-   echo "CONFIG_DARWIN=yes" >> $config_mak
-@@ -785,6 +806,10 @@ if [ "$bsd" = "yes" ] ; then
+@@ -960,6 +984,10 @@ if [ "$bsd" = "yes" ] ; then
    echo "#define _BSD 1" >> $config_h
  fi
  
@@ -81,4 +75,4 @@
 +
  echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
  
- for target in $target_list; do
+ tools=
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ak,v
retrieving revision 1.12
diff -u -r1.12 patch-ak
--- patches/patch-ak    30 Dec 2007 17:12:45 -0000      1.12
+++ patches/patch-ak    18 Jan 2008 12:25:11 -0000
@@ -2,20 +2,7 @@
 
 --- Makefile.orig      2007-02-05 23:01:54 +0000
 +++ Makefile
-@@ -27,10 +27,12 @@ endif
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
-+ifndef CONFIG_DRAGONFLY
- LIBS+=-lrt
- endif
- endif
- endif
-+endif
- 
- all: $(TOOLS) $(DOCS) recurse-all
- 
-@@ -66,21 +68,21 @@ ar      de     en-us  fi  fr-be  hr     
+@@ -164,21 +164,21 @@ ar      de     en-us  fi  fr-be  hr     
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install-doc: $(DOCS)
@@ -30,13 +17,15 @@
  
  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) ${DESTDIR}$(bindir)
+ ifneq ($(TOOLS),)
+-      $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
 +      $(BSD_INSTALL_PROGRAM) $(TOOLS) ${DESTDIR}$(bindir)
+ endif
+-      mkdir -p "$(DESTDIR)$(datadir)"
 +      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(datadir)
        for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-               video.x openbios-sparc32 linux_boot.bin pxe-ne2k_pci.bin \
+               video.x openbios-sparc32 pxe-ne2k_pci.bin \
                pxe-rtl8139.bin pxe-pcnet.bin; do \
 -              $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(datadir)"; \
 +              $(BSD_INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(datadir)"; \
Index: patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ao,v
retrieving revision 1.2
diff -u -r1.2 patch-ao
--- patches/patch-ao    1 Jan 2006 13:48:45 -0000       1.2
+++ patches/patch-ao    18 Jan 2008 12:25:11 -0000
@@ -2,7 +2,7 @@
 
 --- audio/mixeng.c.orig        2005-12-19 17:51:53.000000000 -0500
 +++ audio/mixeng.c
-@@ -101,48 +101,56 @@
+@@ -145,56 +145,64 @@
  #undef IN_T
  #undef SHIFT
  
@@ -14,34 +14,42 @@
 +#define _NBglue(x,y,z) x ## y ## z
 +#define NBglue(x,y,z) _NBglue(x,y,z)
 +
- t_sample *mixeng_conv[2][2][2][2] = {
+ t_sample *mixeng_conv[2][2][2][3] = {
      {
          {
              {
 -                conv_natural_uint8_t_to_mono,
--                conv_natural_uint16_t_to_mono
-+              NBglue(conv_natural_, uint8_t, _to_mono), 
-+                NBglue(conv_natural_, uint16_t, _to_mono)
+-                conv_natural_uint16_t_to_mono,
+-                conv_natural_uint32_t_to_mono
++               NBglue(conv_natural_, uint8_t, _to_mono), 
++                NBglue(conv_natural_, uint16_t, _to_mono),
++                NBglue(conv_natural_, uint32_t, _to_mono)
              },
              {
 -                conv_natural_uint8_t_to_mono,
--                conv_swap_uint16_t_to_mono
+-                conv_swap_uint16_t_to_mono,
+-                conv_swap_uint32_t_to_mono,
 +                NBglue(conv_natural_, uint8_t, _to_mono),
-+                NBglue(conv_swap_, uint16_t, _to_mono)
++                NBglue(conv_swap_, uint16_t, _to_mono),
++                NBglue(conv_swap_, uint32_t, _to_mono)
              }
          },
          {
              {
 -                conv_natural_int8_t_to_mono,
--                conv_natural_int16_t_to_mono
+-                conv_natural_int16_t_to_mono,
+-                conv_natural_int32_t_to_mono
 +                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_natural_, int16_t, _to_mono)
++                NBglue(conv_natural_, int16_t, _to_mono),
++                NBglue(conv_natural_, int32_t, _to_mono)
              },
              {
 -                conv_natural_int8_t_to_mono,
--                conv_swap_int16_t_to_mono
+-                conv_swap_int16_t_to_mono,
+-                conv_swap_int32_t_to_mono
 +                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_swap_, int16_t, _to_mono)
++                NBglue(conv_swap_, int16_t, _to_mono),
++                NBglue(conv_swap_, int32_t, _to_mono)
              }
          }
      },
@@ -49,60 +57,76 @@
          {
              {
 -                conv_natural_uint8_t_to_stereo,
--                conv_natural_uint16_t_to_stereo
+-                conv_natural_uint16_t_to_stereo,
+-                conv_natural_uint32_t_to_stereo
 +                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_natural_, uint16_t, _to_stereo)
++                NBglue(conv_natural_, uint16_t, _to_stereo),
++                NBglue(conv_natural_, uint32_t, _to_stereo)
              },
              {
 -                conv_natural_uint8_t_to_stereo,
--                conv_swap_uint16_t_to_stereo
+-                conv_swap_uint16_t_to_stereo,
+-                conv_swap_uint32_t_to_stereo
 +                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_swap_, uint16_t, _to_stereo)
++                NBglue(conv_swap_, uint16_t, _to_stereo),
++                NBglue(conv_swap_, uint32_t, _to_stereo)
              }
          },
          {
              {
 -                conv_natural_int8_t_to_stereo,
--                conv_natural_int16_t_to_stereo
+-                conv_natural_int16_t_to_stereo,
+-                conv_natural_int32_t_to_stereo
 +                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_natural_, int16_t, _to_stereo)
++                NBglue(conv_natural_, int16_t, _to_stereo),
++                NBglue(conv_natural_, int32_t, _to_stereo)
              },
              {
 -                conv_natural_int8_t_to_stereo,
--                conv_swap_int16_t_to_stereo
+-                conv_swap_int16_t_to_stereo,
+-                conv_swap_int32_t_to_stereo,
 +                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_swap_, int16_t, _to_stereo)
++                NBglue(conv_swap_, int16_t, _to_stereo),
++                NBglue(conv_swap_, int32_t, _to_stereo)
              }
          }
      }
-@@ -152,44 +160,44 @@ f_sample *mixeng_clip[2][2][2][2] = {
+@@ -212,52 +220,52 @@ f_sample *mixeng_clip[2][2][2][3] = {
      {
          {
              {
 -                clip_natural_uint8_t_from_mono,
--                clip_natural_uint16_t_from_mono
+-                clip_natural_uint16_t_from_mono,
+-                clip_natural_uint32_t_from_mono
 +                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_natural_, uint16_t, _from_mono)
++                NBglue(clip_natural_, uint16_t, _from_mono),
++                NBglue(clip_natural_, uint32_t, _from_mono)
              },
              {
 -                clip_natural_uint8_t_from_mono,
--                clip_swap_uint16_t_from_mono
+-                clip_swap_uint16_t_from_mono,
+-                clip_swap_uint32_t_from_mono
 +                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_swap_, uint16_t, _from_mono)
++                NBglue(clip_swap_, uint16_t, _from_mono),
++                NBglue(clip_swap_, uint32_t, _from_mono)
              }
          },
          {
              {
 -                clip_natural_int8_t_from_mono,
--                clip_natural_int16_t_from_mono
+-                clip_natural_int16_t_from_mono,
+-                clip_natural_int32_t_from_mono
 +                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_natural_, int16_t, _from_mono)
++                NBglue(clip_natural_, int16_t, _from_mono),
++                NBglue(clip_natural_, int32_t, _from_mono)
              },
              {
 -                clip_natural_int8_t_from_mono,
--                clip_swap_int16_t_from_mono
+-                clip_swap_int16_t_from_mono,
+-                clip_swap_int32_t_from_mono
 +                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_swap_, int16_t, _from_mono)
++                NBglue(clip_swap_, int16_t, _from_mono),
++                NBglue(clip_swap_, int32_t, _from_mono)
              }
          }
      },
@@ -110,29 +134,37 @@
          {
              {
 -                clip_natural_uint8_t_from_stereo,
--                clip_natural_uint16_t_from_stereo
+-                clip_natural_uint16_t_from_stereo,
+-                clip_natural_uint32_t_from_stereo
 +                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_natural_, uint16_t, _from_stereo)
++                NBglue(clip_natural_, uint16_t, _from_stereo),
++                NBglue(clip_natural_, uint32_t, _from_stereo)
              },
              {
 -                clip_natural_uint8_t_from_stereo,
--                clip_swap_uint16_t_from_stereo
+-                clip_swap_uint16_t_from_stereo,
+-                clip_swap_uint32_t_from_stereo
 +                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_swap_, uint16_t, _from_stereo)
++                NBglue(clip_swap_, uint16_t, _from_stereo),
++                NBglue(clip_swap_, uint32_t, _from_stereo)
              }
          },
          {
              {
 -                clip_natural_int8_t_from_stereo,
--                clip_natural_int16_t_from_stereo
+-                clip_natural_int16_t_from_stereo,
+-                clip_natural_int32_t_from_stereo
 +                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_natural_, int16_t, _from_stereo)
++                NBglue(clip_natural_, int16_t, _from_stereo),
++                NBglue(clip_natural_, int32_t, _from_stereo)
              },
              {
 -                clip_natural_int8_t_from_stereo,
--                clip_swap_int16_t_from_stereo
+-                clip_swap_int16_t_from_stereo,
+-                clip_swap_int32_t_from_stereo
 +                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_swap_, int16_t, _from_stereo)
++                NBglue(clip_swap_, int16_t, _from_stereo),
++                NBglue(clip_swap_, int32_t, _from_stereo)
              }
          }
      }
Index: patches/patch-au
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-au,v
retrieving revision 1.4
diff -u -r1.4 patch-au
--- patches/patch-au    18 Dec 2007 00:16:56 -0000      1.4
+++ patches/patch-au    18 Jan 2008 12:25:11 -0000
@@ -24,6 +24,6 @@
 +#endif
 +#endif
 +
- typedef float float32;
- typedef double float64;
- #ifdef FLOATX80
+ #if defined(__sun__) && !defined(NEED_LIBSUNMATH)
+ 
+ #ifndef isnan
Index: patches/patch-aw
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-aw,v
retrieving revision 1.2
diff -u -r1.2 patch-aw
--- patches/patch-aw    6 Jan 2007 21:21:35 -0000       1.2
+++ patches/patch-aw    18 Jan 2008 12:25:11 -0000
@@ -9,21 +9,11 @@
 diff -u -r1.40 dyngen.c
 --- dyngen.c.orig      2007-01-05 20:32:17.000000000 +0000
 +++ dyngen.c   2007-01-05 20:36:45.000000000 +0000
-@@ -1624,6 +1624,7 @@
+@@ -1738,6 +1738,7 @@
                  if(!sym_name)
                      continue;
-                 if (*sym_name && 
+                 if (*sym_name &&
 +                    !strstart(sym_name, "bswap64", NULL) && /* HF hack */
                      !strstart(sym_name, "__op_param", NULL) &&
                      !strstart(sym_name, "__op_jmp", NULL) &&
                      !strstart(sym_name, "__op_gen_label", NULL)) {
-@@ -1647,6 +1648,9 @@
-                                */
-                               fprintf(outfile, "    extern char %s;\n",
-                                       sym_name);
-+#elif defined(HOST_PPC)
-+                    if(strcmp("bswap32", sym_name))
-+                        fprintf(outfile, "extern char %s;\n", sym_name);
- #else
-                     fprintf(outfile, "extern char %s;\n", sym_name);
- #endif
Index: patches/patch-ay
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ay,v
retrieving revision 1.7
diff -u -r1.7 patch-ay
--- patches/patch-ay    21 May 2007 20:24:48 -0000      1.7
+++ patches/patch-ay    18 Jan 2008 12:25:11 -0000
@@ -1,18 +1,18 @@
 $NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
 
---- block-raw.c.orig   2007-02-06 00:01:54.000000000 +0100
-+++ block-raw.c
-@@ -25,7 +25,9 @@
+--- block-raw-posix.c.orig     2007-02-06 00:01:54.000000000 +0100
++++ block-raw-posix.c
+@@ -28,7 +28,9 @@
+ #endif
  #include "block_int.h"
  #include <assert.h>
- #ifndef _WIN32
 +#ifdef _POSIX_ASYNCHRONOUS_IO
  #include <aio.h>
 +#endif
  
- #ifndef QEMU_TOOL
- #include "exec-all.h"
-@@ -157,6 +159,7 @@ static int raw_pwrite(BlockDriverState *
+ #ifdef CONFIG_COCOA
+ #include <paths.h>
+@@ -230,6 +232,7 @@ static int raw_pwrite(BlockDriverState *
      return ret;
  }
  
@@ -20,7 +20,7 @@
  /***********************************************************/
  /* Unix AIO using POSIX AIO */
  
-@@ -379,6 +382,7 @@ static void raw_aio_cancel(BlockDriverAI
+@@ -455,6 +458,7 @@ static void raw_aio_cancel(BlockDriverAI
          pacb = &acb->next;
      }
  }
@@ -28,7 +28,7 @@
  
  static void raw_close(BlockDriverState *bs)
  {
-@@ -469,6 +473,35 @@ static void raw_flush(BlockDriverState *
+@@ -545,6 +549,35 @@ static void raw_flush(BlockDriverState *
      fsync(s->fd);
  }
  
@@ -51,7 +51,7 @@
 +
 +void qemu_aio_wait(void)
 +{
-+#ifndef QEMU_TOOL
++#ifndef QEMU_IMG
 +    qemu_bh_poll();
 +#endif
 +}
@@ -64,10 +64,10 @@
  BlockDriver bdrv_raw = {
      "raw",
      sizeof(BDRVRawState),
-@@ -480,10 +513,12 @@ BlockDriver bdrv_raw = {
+@@ -556,10 +589,12 @@ BlockDriver bdrv_raw = {
      raw_create,
      raw_flush,
-     
+
 +#ifdef _POSIX_ASYNCHRONOUS_IO
      .bdrv_aio_read = raw_aio_read,
      .bdrv_aio_write = raw_aio_write,
@@ -77,10 +77,10 @@
      .protocol_name = "file",
      .bdrv_pread = raw_pread,
      .bdrv_pwrite = raw_pwrite,
-@@ -816,10 +851,12 @@ BlockDriver bdrv_host_device = {
+@@ -908,10 +943,12 @@ BlockDriver bdrv_host_device = {
      NULL,
      raw_flush,
-     
+
 +#ifdef _POSIX_ASYNCHRONOUS_IO
      .bdrv_aio_read = raw_aio_read,
      .bdrv_aio_write = raw_aio_write,



Home | Main Index | Thread Index | Old Index