Date: Tue, 16 Nov 2004 21:53:44 +0100 (CET) From: Juergen Lock <nox@jelal.kn-bremen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74015: update emulators/qemu to Nov 15 snapshot (after 0.6.1) Message-ID: <200411162053.iAGKriF93146@saturn.kn-bremen.de> Resent-Message-ID: <200411162050.iAGKoNH2064849@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74015 >Category: ports >Synopsis: update emulators/qemu to Nov 15 snapshot (after 0.6.1) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Nov 16 20:50:23 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 5.3-RC2 i386 >Organization: me? organized?? >Environment: System: FreeBSD neptun 5.3-RC2 FreeBSD 5.3-RC2 #3: Wed Nov 3 17:49:24 CET 2004 nox@neptun:/ad0/usr/home/nox/src5/usr/src/sys/i386/compile/NEPTUN i386 >Description: physical cdrom fix, audio merge, CRTC register write protection fix - line_compare, multi_scan and double_scan fixes, ATA DMA (currently only working for linux guests), enter insn fix, vga font change detection, better ctrl-alt handling, cirrus bitblt fix (aka Solaris display fix), qemu-img manual page, etc >How-To-Repeat: >Fix: Removed files: files/patch-exec.c New files: files/patch-audio::audio.c files/patch-audio::ossaudio.c Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 4 Nov 2004 14:26:08 -0000 1.17 +++ Makefile 16 Nov 2004 17:56:49 -0000 @@ -6,12 +6,11 @@ # PORTNAME= qemu -PORTVERSION= 0.6.0s.20041020 -PORTREVISION= 2 +PORTVERSION= 0.6.1s.20041115 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 +25,9 @@ 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: Index: distinfo =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- distinfo 25 Oct 2004 14:57:30 -0000 1.11 +++ distinfo 16 Nov 2004 17:42:59 -0000 @@ -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 Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/pkg-message,v retrieving revision 1.5 diff -u -r1.5 pkg-message --- pkg-message 25 Oct 2004 14:57:30 -0000 1.5 +++ pkg-message 16 Nov 2004 17:32:08 -0000 @@ -16,7 +16,4 @@ 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. ==== Index: files/patch-block.c =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-block.c,v retrieving revision 1.1 diff -u -r1.1 patch-block.c --- files/patch-block.c 4 Nov 2004 14:26:08 -0000 1.1 +++ files/patch-block.c 16 Nov 2004 17:14:57 -0000 @@ -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, §orsize) && ++ 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; --- /dev/null Tue Nov 16 19:33:27 2004 +++ files/patch-audio::audio.c Tue Nov 16 18:57:59 2004 @@ -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__) --- /dev/null Tue Nov 16 19:33:27 2004 +++ files/patch-audio::ossaudio.c Tue Nov 16 18:57:59 2004 @@ -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> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411162053.iAGKriF93146>