diff options
Diffstat (limited to 'emulators/bochs')
| -rw-r--r-- | emulators/bochs/Makefile | 114 | ||||
| -rw-r--r-- | emulators/bochs/PLIST | 6 | ||||
| -rw-r--r-- | emulators/bochs/PLIST.Darwin | 6 | ||||
| -rw-r--r-- | emulators/bochs/distinfo | 12 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-aa | 52 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-ab | 24 |
6 files changed, 97 insertions, 117 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 71666cc18e4..63fa46728e0 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2006/12/03 22:18:16 jmmv Exp $ +# $NetBSD: Makefile,v 1.47 2006/12/04 17:37:24 jmmv Exp $ -DISTNAME= bochs-2.2.1 -PKGREVISION= 1 +DISTNAME= bochs-2.3 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} @@ -17,58 +16,82 @@ USE_LANGUAGES= c c++ ONLY_FOR_COMPILER= gcc CXXFLAGS+= -DPARANOID -# These options are not enabled by default because they can adversely impact -# performance. The number of processors can be either 1 (default), 2, or 4. -#CONFIGURE_ARGS+= --enable-debugger --enable-disasm -#CONFIGURE_ARGS+= --enable-processors=2 CONFIGURE_ARGS+= --enable-cdrom CONFIGURE_ARGS+= --enable-ne2000 -CONFIGURE_ARGS+= --enable-sb16=dummy -.if !defined(BOCHS_TINY) -CONFIGURE_ARGS+= --enable-new-pit -CONFIGURE_ARGS+= --enable-pci -CONFIGURE_ARGS+= --enable-cpu-level=6 -CONFIGURE_ARGS+= --enable-apic -CONFIGURE_ARGS+= --enable-usb -CONFIGURE_ARGS+= --enable-4meg-pages -CONFIGURE_ARGS+= --enable-pae -CONFIGURE_ARGS+= --enable-guest2host-tlb -CONFIGURE_ARGS+= --enable-repeat-speedups -CONFIGURE_ARGS+= --enable-icache + +MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} +MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q} +MAKE_ENV+= WGET=${FETCH_CMD:Q} + +PKG_OPTIONS_VAR= PKG_OPTIONS.bochs +PKG_SUPPORTED_OPTIONS+= debug tiny + .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:M*-*-i386) -CONFIGURE_ARGS+= --enable-fast-function-calls +.include "../../mk/bsd.options.mk" + +# Debugging features for the client operating systems. These options are +# not enabled by default because they can adversely impact performance. +.if !empty(PKG_OPTIONS:Mdebug) +CONFIGURE_ARGS+= --enable-debugger +CONFIGURE_ARGS+= --enable-disasm +CONFIGURE_ARGS+= --enable-iodebug +CONFIGURE_ARGS+= --enable-x86-debugger .endif -CONFIGURE_ARGS+= --enable-global-pages -CONFIGURE_ARGS+= --enable-host-specific-asms + +.if empty(PKG_OPTIONS:Mtiny) +CONFIGURE_ARGS+= --enable-3dnow +CONFIGURE_ARGS+= --enable-4meg-pages CONFIGURE_ARGS+= --enable-all-optimizations -CONFIGURE_ARGS+= --enable-vbe +CONFIGURE_ARGS+= --enable-apic +CONFIGURE_ARGS+= --enable-cpu-level=6 +CONFIGURE_ARGS+= --enable-daz CONFIGURE_ARGS+= --enable-fpu +CONFIGURE_ARGS+= --enable-global-pages +CONFIGURE_ARGS+= --enable-guest2host-tlb +CONFIGURE_ARGS+= --enable-host-specific-asms +CONFIGURE_ARGS+= --enable-icache CONFIGURE_ARGS+= --enable-mmx -CONFIGURE_ARGS+= --enable-3dnow -CONFIGURE_ARGS+= --enable-sse=2 -CONFIGURE_ARGS+= --enable-daz +CONFIGURE_ARGS+= --enable-new-pit +CONFIGURE_ARGS+= --enable-pae +CONFIGURE_ARGS+= --enable-pci +CONFIGURE_ARGS+= --enable-repeat-speedups CONFIGURE_ARGS+= --enable-sep -.endif # !BOCHS_TINY -CONFIGURE_ENV+= CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}" -MANCOMPRESSED= yes -MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} \ - GUNZIP_CMD=${GUNZIP_CMD:Q} +CONFIGURE_ARGS+= --enable-sse=3 +CONFIGURE_ARGS+= --enable-usb +CONFIGURE_ARGS+= --enable-vbe +CONFIGURE_ARGS+= --enable-x86-64 + +. if !empty(MACHINE_PLATFORM:M*-*-i386) +CONFIGURE_ARGS+= --enable-fast-function-calls +. endif -BOCHS_MAINDIR= ${PREFIX}/share/bochs -BOCHS_BIOSDIR= ${BOCHS_MAINDIR}/bios -BOCHS_FONTDIR= ${BOCHS_MAINDIR}/xfonts +. if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --enable-sb16=osx +. elif ${OPSYS} == "FreeBSD" +CONFIGURE_ARGS+= --enable-sb16=freebsd +. elif ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --enable-sb16=linux +. else +CONFIGURE_ARGS+= --enable-sb16=dummy +. endif +.endif + +.if ${OPSYS} == "Linux" +BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,' +BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,' +.elif ${OPSYS} == "Darwin" +BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,' +BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,' +.else +BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,,' +BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,' +.endif .if ${OPSYS} == "Darwin" INSTALL_MAKE_FLAGS+= prefix=${PREFIX}/libexec/bochs MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin PLIST_SRC= ${.CURDIR}/PLIST.Darwin -post-configure: - ${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK - ${SED} -e 's@XXXPREFIXXXX@$$BXSHARE@' \ - < ${WRKSRC}/.bochsrc.BAK > ${WRKSRC}/.bochsrc - post-build: { ${ECHO} '#! ${SH}'; \ ${ECHO} 'exec ${PREFIX}/libexec/bochs/bochs.app/Contents/MacOS/bochs'\ @@ -79,12 +102,11 @@ post-install: ${LN} -fs ${PREFIX}/libexec/bochs/bxcommit ${PREFIX}/bin/bxcommit ${LN} -fs ${PREFIX}/libexec/bochs/bximage ${PREFIX}/bin/bximage .else -.include "../../mk/x11.buildlink3.mk" - -post-configure: - ${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK - ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \ - < ${WRKSRC}/.bochsrc.BAK > ${WRKSRC}/.bochsrc +. include "../../mk/x11.buildlink3.mk" .endif +pre-configure: + ${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new + mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc + .include "../../mk/bsd.pkg.mk" diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index 1445e2a3d7c..e781267e4d3 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/11/26 06:15:00 ben Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/12/04 17:37:24 jmmv Exp $ bin/bochs bin/bxcommit bin/bximage @@ -7,9 +7,6 @@ man/man1/bochs.1 man/man1/bxcommit.1 man/man1/bximage.1 man/man5/bochsrc.5 -share/bochs/BIOS-bochs-2-processors -share/bochs/BIOS-bochs-4-processors -share/bochs/BIOS-bochs-8-processors share/bochs/BIOS-bochs-latest share/bochs/VGABIOS-elpin-2.40 share/bochs/VGABIOS-elpin-LICENSE @@ -28,6 +25,7 @@ share/bochs/keymaps/x11-pc-fr.map share/bochs/keymaps/x11-pc-it.map share/bochs/keymaps/x11-pc-ru.map share/bochs/keymaps/x11-pc-se.map +share/bochs/keymaps/x11-pc-si.map share/bochs/keymaps/x11-pc-uk.map share/bochs/keymaps/x11-pc-us.map share/doc/bochs/CHANGES diff --git a/emulators/bochs/PLIST.Darwin b/emulators/bochs/PLIST.Darwin index 81989acf14c..40ef2a49956 100644 --- a/emulators/bochs/PLIST.Darwin +++ b/emulators/bochs/PLIST.Darwin @@ -1,10 +1,7 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2006/12/03 22:18:16 jmmv Exp $ +@comment $NetBSD: PLIST.Darwin,v 1.2 2006/12/04 17:37:24 jmmv Exp $ bin/bochs bin/bxcommit bin/bximage -libexec/bochs/BIOS-bochs-2-processors -libexec/bochs/BIOS-bochs-4-processors -libexec/bochs/BIOS-bochs-8-processors libexec/bochs/BIOS-bochs-latest libexec/bochs/CHANGES.txt libexec/bochs/COPYING.txt @@ -38,6 +35,7 @@ libexec/bochs/keymaps/x11-pc-fr.map libexec/bochs/keymaps/x11-pc-it.map libexec/bochs/keymaps/x11-pc-ru.map libexec/bochs/keymaps/x11-pc-se.map +libexec/bochs/keymaps/x11-pc-si.map libexec/bochs/keymaps/x11-pc-uk.map libexec/bochs/keymaps/x11-pc-us.map @dirrm libexec/bochs/keymaps diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index a4757cbe570..d70556365db 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.19 2006/12/03 22:18:16 jmmv Exp $ +$NetBSD: distinfo,v 1.20 2006/12/04 17:37:24 jmmv Exp $ -SHA1 (bochs-2.2.1.tar.gz) = 72a59872189ab4b206c09c6ccfb83fe0ee988b8e -RMD160 (bochs-2.2.1.tar.gz) = 2cf906281a71cc6db546da715852ac98aab074cc -Size (bochs-2.2.1.tar.gz) = 3785329 bytes -SHA1 (patch-aa) = a6888ff31c879e3ba96297ddfe2f38f6ed723918 -SHA1 (patch-ab) = f9eeb7356503fcd3ab01e5381e0fa2fdc6e78a58 +SHA1 (bochs-2.3.tar.gz) = 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf +RMD160 (bochs-2.3.tar.gz) = 545e0bf3edd0fdd073a107e835f90c65451c100e +Size (bochs-2.3.tar.gz) = 3812273 bytes +SHA1 (patch-aa) = 65538ace00fa74f0871210364622ddc8027c2655 +SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228 SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e SHA1 (patch-ad) = e305a33c204d9957d9da4048dddb194fff76dc12 SHA1 (patch-ae) = b8092c73b77adebc054e7adf4a773206af726bf5 diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa index e4c9624eb23..90ba8d7863d 100644 --- a/emulators/bochs/patches/patch-aa +++ b/emulators/bochs/patches/patch-aa @@ -1,67 +1,29 @@ -$NetBSD: patch-aa,v 1.10 2005/11/26 06:15:00 ben Exp $ +$NetBSD: patch-aa,v 1.11 2006/12/04 17:37:24 jmmv Exp $ ---- .bochsrc.orig 2005-07-06 12:59:47.000000000 -0700 +--- .bochsrc.orig 2006-06-22 20:50:47.000000000 +0200 +++ .bochsrc -@@ -70,10 +70,10 @@ - # You can also use the environment variable $BXSHARE to specify the - # location of the BIOS. - #======================================================================= --romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000 --#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000 --#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000 --#romimage: file=bios/rombios.bin, address=0xf0000 -+romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-latest, address=0xf0000 -+#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-2-processors, address=0xf0000 -+#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-4-processors, address=0xf0000 -+#romimage: file=XXXPREFIXXXX/share/bochs/rombios.bin, address=0xf0000 - - #======================================================================= - # MEGS -@@ -108,9 +108,9 @@ megs: 32 - # VGAROMIMAGE - # You now need to load a VGA ROM BIOS into C0000. - #======================================================================= --#vgaromimage: file=bios/VGABIOS-elpin-2.40 --vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest --#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus -+#vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40 -+vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest -+#vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest-cirrus - - #======================================================================= - # VGA: -@@ -143,13 +143,13 @@ vga: extension=vbe +@@ -196,13 +196,13 @@ vga: extension=vbe # such as a: or b: as the path. The parameter 'image' works with image files # only. In that case the size must match one of the supported types. #======================================================================= -floppya: 1_44=/dev/fd0, status=inserted -+#floppya: 1_44=/dev/fd0, status=inserted ++@FLOPPY_LINUX@floppya: 1_44=/dev/fd0, status=inserted #floppya: image=../1.44, status=inserted #floppya: 1_44=/dev/fd0H1440, status=inserted #floppya: 1_2=../1_2, status=inserted #floppya: 1_44=a:, status=inserted #floppya: 1_44=a.img, status=inserted -#floppya: 1_44=/dev/rfd0a, status=inserted -+floppya: 1_44=/dev/rfd0a, status=inserted ++@FLOPPY_BSD@floppya: 1_44=/dev/rfd0a, status=inserted #======================================================================= # FLOPPYB: -@@ -227,7 +227,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2= +@@ -282,7 +282,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2= # ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63 # ata3-slave: type=cdrom, path=iso.sample, status=inserted #======================================================================= -ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17 +#ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17 + #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect #ata0-slave: type=cdrom, path=D:, status=inserted #ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted - #ata0-slave: type=cdrom, path="drive", status=inserted -@@ -247,7 +247,8 @@ ata0-master: type=disk, mode=flat, path= - # boot: cdrom, floppy, disk - #======================================================================= - #boot: floppy --boot: disk -+#boot: disk -+boot: a - - #======================================================================= - # IPS: diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab index 6af4467a36c..2b69729d830 100644 --- a/emulators/bochs/patches/patch-ab +++ b/emulators/bochs/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.8 2006/12/03 22:18:16 jmmv Exp $ +$NetBSD: patch-ab,v 1.9 2006/12/04 17:37:24 jmmv Exp $ ---- iodev/cdrom.cc.orig 2006-12-03 20:55:44.000000000 +0100 -+++ iodev/cdrom.cc -@@ -109,7 +109,7 @@ extern "C" { - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> --#include <dev/disk.h> -+#include <sys/disk.h> - #include <errno.h> - #include <paths.h> - #include <sys/param.h> +--- iodev/soundosx.cc.orig 2006-03-03 21:29:50.000000000 +0100 ++++ iodev/soundosx.cc +@@ -5,7 +5,7 @@ + // This file (SOUNDOSX.CC) written and donated by Brian Huffman + + #ifdef PARANOID +-#include <MacTypes.h> ++#include <CoreServices/CoreServices.h> + #else + #define Float32 KLUDGE_Float32 + #define Float64 KLUDGE_Float64 |