o Update to 0.6.1(2004/11/15 snapshot).

  FreeBSD related changes: physical cdrom fix, audio merge

PR:		ports/74015
Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)

14 files changed, 134 insertions, 46 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 31015da3daba..e17b56b8ea26 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.6.0s.20041020
-PORTREVISION=	2
+PORTVERSION=	0.6.1s.20041115
+PORTREVISION=	0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.fuqn.ca/distfiles/ \
+MASTER_SITES=	http://www.fruitsalad.org/qemu/ \
 		http://dad-answers.com/qemu/
-DISTNAME=	${PORTNAME}-snapshot-2004-10-20_23
+DISTNAME=	${PORTNAME}-snapshot-2004-11-15_23
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	QEMU CPU Emulator
@@ -26,10 +26,9 @@ USE_GETOPT_LONG=	yes
 USE_SDL=	sdl
 USE_GCC=	3.4
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
 PATCH_STRIP=	-p1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}\ -I${PREFIX}/include
-MAN1=		qemu.1
+MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
 post-install:
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 0aaa39418c79..5ed7f8c62847 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-10-20_23.tar.bz2) = 6f14b647038ad70f91b5e9b6b99dad0f
-SIZE (qemu-snapshot-2004-10-20_23.tar.bz2) = 823062
+MD5 (qemu-snapshot-2004-11-15_23.tar.bz2) = ea604165b37be4d4dd6c3fbdfacf06c5
+SIZE (qemu-snapshot-2004-11-15_23.tar.bz2) = 845053
diff --git a/emulators/qemu-devel/files/patch-audio::audio.c b/emulators/qemu-devel/files/patch-audio::audio.c
new file mode 100644
index 000000000000..0b50a522e6fd
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-audio::audio.c
@@ -0,0 +1,12 @@
+Index: qemu/audio/audio.c
+@@ -28,6 +28,10 @@
+ 
+ #include "audio/audio_int.h"
+ 
++#ifndef INT16_MAX
++#define	INT16_MAX	0x7fff
++#endif
++
+ #define dolog(...) AUD_log ("audio", __VA_ARGS__)
+ #ifdef DEBUG
+ #define ldebug(...) dolog (__VA_ARGS__)
diff --git a/emulators/qemu-devel/files/patch-audio::ossaudio.c b/emulators/qemu-devel/files/patch-audio::ossaudio.c
new file mode 100644
index 000000000000..8fc9e99b9153
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-audio::ossaudio.c
@@ -0,0 +1,11 @@
+Index: qemu/audio/ossaudio.c
+@@ -21,8 +21,8 @@
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  * THE SOFTWARE.
+  */
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
+ #include <assert.h>
diff --git a/emulators/qemu-devel/files/patch-block.c b/emulators/qemu-devel/files/patch-block.c
index d174d8f96e27..c924d2d96039 100644
--- a/emulators/qemu-devel/files/patch-block.c
+++ b/emulators/qemu-devel/files/patch-block.c
@@ -1,5 +1,4 @@
---- qemu/block.c.orig	Thu Sep 30 06:27:57 2004
-+++ qemu/block.c	Thu Nov  4 23:19:37 2004
+Index: qemu/block.c
 @@ -21,6 +21,17 @@
   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   * THE SOFTWARE.
@@ -18,6 +17,42 @@
  #include "vl.h"
  #include "block_int.h"
  
+@@ -103,14 +103,25 @@
+ {
+     int fd, ret, score, score_max;
+     BlockDriver *drv1, *drv;
+-    uint8_t buf[1024];
++    uint8_t *buf;
++    size_t bufsize = 1024;
++    u_int sectorsize = 512;
+ 
+     fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
+     if (fd < 0)
+         return NULL;
+-    ret = read(fd, buf, sizeof(buf));
++#ifdef DIOCGSECTORSIZE
++    if (!ioctl(fd, DIOCGSECTORSIZE, &sectorsize) &&
++        sectorsize > bufsize)
++        bufsize = sectorsize;
++#endif
++    buf = malloc(bufsize);
++    if (!buf)
++        return NULL;
++    ret = read(fd, buf, bufsize);
+     if (ret < 0) {
+         close(fd);
++        free(buf);
+         return NULL;
+     }
+     close(fd);
+@@ -124,6 +135,7 @@
+             drv = drv1;
+         }
+     }
++    free(buf);
+     return drv;
+ }
+ 
 @@ -522,6 +533,15 @@
              return -1;
          bs->read_only = 1;
diff --git a/emulators/qemu-devel/files/patch-exec.c b/emulators/qemu-devel/files/patch-exec.c
deleted file mode 100644
index f6978d7cc830..000000000000
--- a/emulators/qemu-devel/files/patch-exec.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- qemu/exec.c.orig	Mon Oct 11 00:14:19 2004
-+++ qemu/exec.c	Thu Oct 28 23:28:25 2004
-@@ -21,6 +21,7 @@
- #ifdef _WIN32
- #include <windows.h>
- #else
-+#include <sys/types.h>
- #include <sys/mman.h>
- #endif
- #include <stdlib.h>
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index b2eacacba268..049dac5952c5 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -16,7 +16,4 @@ is 100...  The linux 2.6 kernel uses 1000 by default btw.)  Enabling
 patch to emulators/rtc.)
 - using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE
 ioctl)
-- physical cdroms don't work at the moment because of the new block layer,
-Antony says he already has a new patch for that so expect this to be
-working again soon.
 ====
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 31015da3daba..e17b56b8ea26 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.6.0s.20041020
-PORTREVISION=	2
+PORTVERSION=	0.6.1s.20041115
+PORTREVISION=	0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.fuqn.ca/distfiles/ \
+MASTER_SITES=	http://www.fruitsalad.org/qemu/ \
 		http://dad-answers.com/qemu/
-DISTNAME=	${PORTNAME}-snapshot-2004-10-20_23
+DISTNAME=	${PORTNAME}-snapshot-2004-11-15_23
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	QEMU CPU Emulator
@@ -26,10 +26,9 @@ USE_GETOPT_LONG=	yes
 USE_SDL=	sdl
 USE_GCC=	3.4
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
 PATCH_STRIP=	-p1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}\ -I${PREFIX}/include
-MAN1=		qemu.1
+MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
 post-install:
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 0aaa39418c79..5ed7f8c62847 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-10-20_23.tar.bz2) = 6f14b647038ad70f91b5e9b6b99dad0f
-SIZE (qemu-snapshot-2004-10-20_23.tar.bz2) = 823062
+MD5 (qemu-snapshot-2004-11-15_23.tar.bz2) = ea604165b37be4d4dd6c3fbdfacf06c5
+SIZE (qemu-snapshot-2004-11-15_23.tar.bz2) = 845053
diff --git a/emulators/qemu/files/patch-audio::audio.c b/emulators/qemu/files/patch-audio::audio.c
new file mode 100644
index 000000000000..0b50a522e6fd
--- /dev/null
+++ b/emulators/qemu/files/patch-audio::audio.c
@@ -0,0 +1,12 @@
+Index: qemu/audio/audio.c
+@@ -28,6 +28,10 @@
+ 
+ #include "audio/audio_int.h"
+ 
++#ifndef INT16_MAX
++#define	INT16_MAX	0x7fff
++#endif
++
+ #define dolog(...) AUD_log ("audio", __VA_ARGS__)
+ #ifdef DEBUG
+ #define ldebug(...) dolog (__VA_ARGS__)
diff --git a/emulators/qemu/files/patch-audio::ossaudio.c b/emulators/qemu/files/patch-audio::ossaudio.c
new file mode 100644
index 000000000000..8fc9e99b9153
--- /dev/null
+++ b/emulators/qemu/files/patch-audio::ossaudio.c
@@ -0,0 +1,11 @@
+Index: qemu/audio/ossaudio.c
+@@ -21,8 +21,8 @@
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  * THE SOFTWARE.
+  */
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
+ #include <assert.h>
diff --git a/emulators/qemu/files/patch-block.c b/emulators/qemu/files/patch-block.c
index d174d8f96e27..c924d2d96039 100644
--- a/emulators/qemu/files/patch-block.c
+++ b/emulators/qemu/files/patch-block.c
@@ -1,5 +1,4 @@
---- qemu/block.c.orig	Thu Sep 30 06:27:57 2004
-+++ qemu/block.c	Thu Nov  4 23:19:37 2004
+Index: qemu/block.c
 @@ -21,6 +21,17 @@
   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   * THE SOFTWARE.
@@ -18,6 +17,42 @@
  #include "vl.h"
  #include "block_int.h"
  
+@@ -103,14 +103,25 @@
+ {
+     int fd, ret, score, score_max;
+     BlockDriver *drv1, *drv;
+-    uint8_t buf[1024];
++    uint8_t *buf;
++    size_t bufsize = 1024;
++    u_int sectorsize = 512;
+ 
+     fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
+     if (fd < 0)
+         return NULL;
+-    ret = read(fd, buf, sizeof(buf));
++#ifdef DIOCGSECTORSIZE
++    if (!ioctl(fd, DIOCGSECTORSIZE, &sectorsize) &&
++        sectorsize > bufsize)
++        bufsize = sectorsize;
++#endif
++    buf = malloc(bufsize);
++    if (!buf)
++        return NULL;
++    ret = read(fd, buf, bufsize);
+     if (ret < 0) {
+         close(fd);
++        free(buf);
+         return NULL;
+     }
+     close(fd);
+@@ -124,6 +135,7 @@
+             drv = drv1;
+         }
+     }
++    free(buf);
+     return drv;
+ }
+ 
 @@ -522,6 +533,15 @@
              return -1;
          bs->read_only = 1;
diff --git a/emulators/qemu/files/patch-exec.c b/emulators/qemu/files/patch-exec.c
deleted file mode 100644
index f6978d7cc830..000000000000
--- a/emulators/qemu/files/patch-exec.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- qemu/exec.c.orig	Mon Oct 11 00:14:19 2004
-+++ qemu/exec.c	Thu Oct 28 23:28:25 2004
-@@ -21,6 +21,7 @@
- #ifdef _WIN32
- #include <windows.h>
- #else
-+#include <sys/types.h>
- #include <sys/mman.h>
- #endif
- #include <stdlib.h>
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index b2eacacba268..049dac5952c5 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -16,7 +16,4 @@ is 100...  The linux 2.6 kernel uses 1000 by default btw.)  Enabling
 patch to emulators/rtc.)
 - using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE
 ioctl)
-- physical cdroms don't work at the moment because of the new block layer,
-Antony says he already has a new patch for that so expect this to be
-working again soon.
 ====