[pkgsrc/trunk]: pkgsrc Update emulators/qemu to 0.6.1.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update emulators/qemu to 0.6.1.
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:50:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c251d004e32f
branches:  trunk
changeset: 483579:c251d004e32f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Nov 15 11:35:30 2004 +0000

description:
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:

 doc/CHANGES                     |   4 +-
 emulators/qemu/Makefile         |  13 ++++-
 emulators/qemu/PLIST            |   7 +-
 emulators/qemu/distinfo         |  24 ++++++----
 emulators/qemu/patches/patch-aa |  40 ++++++-------------
 emulators/qemu/patches/patch-ab |  39 -------------------
 emulators/qemu/patches/patch-ac |  20 ++++-----
 emulators/qemu/patches/patch-ad |  13 ------
 emulators/qemu/patches/patch-ae |  22 ----------
 emulators/qemu/patches/patch-ag |  26 ++++++------
 emulators/qemu/patches/patch-ak |  19 ++++----
 emulators/qemu/patches/patch-al |  22 ++++++++++
 emulators/qemu/patches/patch-am |  13 ++++++
 emulators/qemu/patches/patch-an |  83 +++++++++++++++++++++++++++++++++++++++++
 emulators/qemu/patches/patch-ao |  60 +++++++++++++++++++++++++++++
 emulators/qemu/patches/patch-ap |  14 ++++++
 emulators/qemu/patches/patch-aq |  11 +++++
 emulators/qemu/patches/patch-ar |  11 +++++
 18 files changed, 290 insertions(+), 151 deletions(-)

diffs (truncated from 610 to 300 lines):

diff -r f3e9568ef07d -r c251d004e32f doc/CHANGES
--- a/doc/CHANGES       Mon Nov 15 11:16:27 2004 +0000
+++ b/doc/CHANGES       Mon Nov 15 11:35:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7866 2004/11/15 11:16:27 adam Exp $
+$NetBSD: CHANGES,v 1.7867 2004/11/15 11:35:30 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -5286,3 +5286,5 @@
        Updated kkbswitch to 1.4.2 [markd 2004-11-15]
        Updated liferea to 0.6.2 [jmmv 2004-11-15]
        Updated ImageMagick to 6.1.4.1 [adam 2004-11-15]
+       Updated dspam to 3.2.2 [xtraeme 2004-11-15]
+       Updated qemu to 0.6.1 [xtraeme 2004-11-15]
diff -r f3e9568ef07d -r c251d004e32f emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/Makefile   Mon Nov 15 11:35:30 2004 +0000
@@ -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 @@
 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 @@
 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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/PLIST
--- a/emulators/qemu/PLIST      Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/PLIST      Mon Nov 15 11:35:30 2004 +0000
@@ -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/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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/distinfo   Mon Nov 15 11:35:30 2004 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-aa
--- a/emulators/qemu/patches/patch-aa   Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/patches/patch-aa   Mon Nov 15 11:35:30 2004 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-ab
--- a/emulators/qemu/patches/patch-ab   Mon Nov 15 11:16:27 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-ac
--- a/emulators/qemu/patches/patch-ac   Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/patches/patch-ac   Mon Nov 15 11:35:30 2004 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-ad
--- a/emulators/qemu/patches/patch-ad   Mon Nov 15 11:16:27 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-ae
--- a/emulators/qemu/patches/patch-ae   Mon Nov 15 11:16:27 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f3e9568ef07d -r c251d004e32f emulators/qemu/patches/patch-ag
--- a/emulators/qemu/patches/patch-ag   Mon Nov 15 11:16:27 2004 +0000
+++ b/emulators/qemu/patches/patch-ag   Mon Nov 15 11:35:30 2004 +0000
@@ -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 @@
  fi
  
  if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
-@@ -293,7 +293,7 @@ else
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/libstatgrab Update to 0.11. From MAINTAINER in P...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc + openldap-2.2.18
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/libstatgrab Update to 0.11. From MAINTAINER in P...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc + openldap-2.2.18
Indexes:
Home | Main Index | Thread Index | Old Index