- Update to 20061214

- Fix physical device access

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

8 files changed, 30 insertions, 26 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index e7183d593a8..d805fb573f6 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.8.2s.20061128
+PORTVERSION=	0.8.2s.20061214
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.qemu.org/:release \
 		http://www.volny.cz/xnavara/qemu/:snapshot \
 		http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
 		http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME=	${PORTNAME}-snapshot-2006-11-28_05
+DISTNAME=	${PORTNAME}-snapshot-2006-12-14_05
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 DIST_SUBDIR=	qemu
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index afe3bc65330..36ed78d325b 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 14dfd81c651af3982125c33f19f7a49a
-SHA256 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = e31744fd00096a41aabc3dc8d2f1f989cfd11f4c4ffa155a1f91f8c5ae244dfe
-SIZE (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 1495656
+MD5 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = bcd7f7dec32f8dec6eb5b98068a631b2
+SHA256 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 4111586f06f185c870f0439ca93b46eb089161bd5a42379633b5bd7d10f10469
+SIZE (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 1501881
 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
 SIZE (qemu/patch3_cirrus) = 8817
diff --git a/emulators/qemu-devel/files/patch-block-raw.c b/emulators/qemu-devel/files/patch-block-raw.c
index c3a83f27994..e4690530bf4 100644
--- a/emulators/qemu-devel/files/patch-block-raw.c
+++ b/emulators/qemu-devel/files/patch-block-raw.c
@@ -1,4 +1,14 @@
 Index: qemu/block-raw.c
+@@ -51,6 +51,9 @@
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+ #endif
++#if defined(__FreeBSD__) && __FreeBSD__ > 4
++#include <sys/disk.h>
++#endif
+ 
+ //#define DEBUG_FLOPPY
+ 
 @@ -164,9 +164,20 @@
  static int aio_sig_num = SIGUSR2;
  static RawAIOCB *first_aio; /* AIO issued */
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index e26c4d60f0c..a7276c83442 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -63,14 +63,6 @@ with qemu's now by default enabled cdrom dma.  You can build the port with
 CDROM_DMA disabled to disable it.
 - if you build qemu wihout SDL and then get crashes running it try
 passing it -nographic.  This should probably be default in that case...
-- physical device access (real cdrom/dvd instead of iso) seems to cause
-problems with some guests now.  If this happens to you you can make
-an iso of the disc by doing something like
-	dd bs=2k </dev/acd0 >cd.iso
-and then use
-	qemu -cdrom cd.iso ...
-instead of giving it the physical device.  (This might also speed up the
-guest somewhat.)
 - qemu now uses aio at least for ide dma, so if you get `Bad system call'
 crashes that is because aio is not (kld)loaded.
 ====
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index e7183d593a8..d805fb573f6 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.8.2s.20061128
+PORTVERSION=	0.8.2s.20061214
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.qemu.org/:release \
 		http://www.volny.cz/xnavara/qemu/:snapshot \
 		http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
 		http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME=	${PORTNAME}-snapshot-2006-11-28_05
+DISTNAME=	${PORTNAME}-snapshot-2006-12-14_05
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 DIST_SUBDIR=	qemu
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index afe3bc65330..36ed78d325b 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 14dfd81c651af3982125c33f19f7a49a
-SHA256 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = e31744fd00096a41aabc3dc8d2f1f989cfd11f4c4ffa155a1f91f8c5ae244dfe
-SIZE (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 1495656
+MD5 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = bcd7f7dec32f8dec6eb5b98068a631b2
+SHA256 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 4111586f06f185c870f0439ca93b46eb089161bd5a42379633b5bd7d10f10469
+SIZE (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 1501881
 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
 SIZE (qemu/patch3_cirrus) = 8817
diff --git a/emulators/qemu/files/patch-block-raw.c b/emulators/qemu/files/patch-block-raw.c
index c3a83f27994..e4690530bf4 100644
--- a/emulators/qemu/files/patch-block-raw.c
+++ b/emulators/qemu/files/patch-block-raw.c
@@ -1,4 +1,14 @@
 Index: qemu/block-raw.c
+@@ -51,6 +51,9 @@
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+ #endif
++#if defined(__FreeBSD__) && __FreeBSD__ > 4
++#include <sys/disk.h>
++#endif
+ 
+ //#define DEBUG_FLOPPY
+ 
 @@ -164,9 +164,20 @@
  static int aio_sig_num = SIGUSR2;
  static RawAIOCB *first_aio; /* AIO issued */
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index e26c4d60f0c..a7276c83442 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -63,14 +63,6 @@ with qemu's now by default enabled cdrom dma.  You can build the port with
 CDROM_DMA disabled to disable it.
 - if you build qemu wihout SDL and then get crashes running it try
 passing it -nographic.  This should probably be default in that case...
-- physical device access (real cdrom/dvd instead of iso) seems to cause
-problems with some guests now.  If this happens to you you can make
-an iso of the disc by doing something like
-	dd bs=2k </dev/acd0 >cd.iso
-and then use
-	qemu -cdrom cd.iso ...
-instead of giving it the physical device.  (This might also speed up the
-guest somewhat.)
 - qemu now uses aio at least for ide dma, so if you get `Bad system call'
 crashes that is because aio is not (kld)loaded.
 ====