Date: Fri, 10 Jan 2003 23:15:08 +0000 From: Keith Jones <freebsd.dev@blueyonder.co.uk> To: Eric Anholt <anholt@FreeBSD.org> Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/46937: Update port: emulators/bochs to 2.0.1 Message-ID: <3E1F53FC.2080606@blueyonder.co.uk> In-Reply-To: <200301101855.h0AItvEX078094@freefall.freebsd.org> References: <200301101855.h0AItvEX078094@freefall.freebsd.org> <3E1F4D6A.3070404@blueyonder.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030802030808010504080000
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Keith Jones wrote:
> See patch #661590 on bochs.sourceforge.net. Until the bochs team apply
> it, you might just want to bung it into the port.
Apologies for double post - it turns out the bochs team have just
applied it and closed the PR, so please find the patch attached.
Keith
--------------030802030808010504080000
Content-Type: text/plain;
name="cdrom.cc.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="cdrom.cc.diff"
--- bochs-2.0/iodev/cdrom.cc Sat Dec 14 21:29:42 2002
+++ bochs-work/iodev/cdrom.cc Fri Jan 3 13:21:31 2003
@@ -101,6 +101,8 @@
#include <sys/cdio.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
+// ntohl(x) et al have been moved out of sys/param.h in FreeBSD 5
+#include <netinet/in.h>
// XXX
#define BX_CD_FRAMESIZE 2048
@@ -881,7 +883,7 @@
t.data_len = sizeof(tocentry);
t.data = &tocentry;
- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
+ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
BX_PANIC(("cdrom: read_toc: READTOCENTRY failed."));
buf[len++] = 0; // Reserved
@@ -910,7 +912,7 @@
t.data_len = sizeof(tocentry);
t.data = &tocentry;
- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
+ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
BX_PANIC(("cdrom: read_toc: READTOCENTRY lead-out failed."));
buf[len++] = 0; // Reserved
@@ -1123,9 +1125,8 @@
}
#elif defined(__FreeBSD__)
{
- // Read the TOC to get the data size, since disklabel doesn't appear
- // to work, sadly.
- // Keith Jones, 16 January 2000
+ // Read the TOC to get the size of the data track.
+ // Keith Jones <freebsd.dev@blueyonder.co.uk>, 16 January 2000
#define MAX_TRACKS 100
--------------030802030808010504080000--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3E1F53FC.2080606>