pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/43574: Please update emulators/bochs to 2.4.5
>Number: 43574
>Category: pkg
>Synopsis: Please update emulators/bochs to 2.4.5
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Jul 06 02:25:00 +0000 2010
>Originator: Ryo ONODERA
>Release: NetBSD 5.99.34
>Organization:
>Environment:
System: NetBSD hydrogen.elements.tetera.org 5.99.34 NetBSD 5.99.34
(BRIGHTGIRL7) #31: Sat Jul 3 12:28:57 JST 2010
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/BRIGHTGIRL7
i386
Architecture: i386
Machine: i386
>Description:
Please update emulators/bochs to 2.4.5 from 2.3.7.
>How-To-Repeat:
>Fix:
diff -x CVS -upNr ../emulators/bochs/Makefile bochs/Makefile
--- ../emulators/bochs/Makefile 2009-05-25 21:54:48.000000000 +0900
+++ bochs/Makefile 2010-07-06 07:24:42.000000000 +0900
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2009/05/25 12:54:48 mishka Exp $
+# $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
-DISTNAME= bochs-2.3.7
-PKGREVISION= 3
+DISTNAME= bochs-2.4.5
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
@@ -27,7 +26,7 @@ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q}
MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q}
MAKE_ENV+= WGET=${FETCH_CMD:Q}
-PLIST_VARS+= notiny nox11 x11
+PLIST_VARS+= debug notiny nox11 plugins x11
PKG_OPTIONS_VAR= PKG_OPTIONS.bochs
PKG_SUPPORTED_OPTIONS+= debug tiny x11
@@ -39,6 +38,7 @@ PKG_SUGGESTED_OPTIONS+= x11
# 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+= --disable-plugins
CONFIGURE_ARGS+= --enable-debugger
CONFIGURE_ARGS+= --enable-disasm
CONFIGURE_ARGS+= --enable-iodebug
@@ -48,41 +48,40 @@ CONFIGURE_ARGS+= --enable-x86-debugger
.if empty(PKG_OPTIONS:Mtiny)
PLIST.notiny= yes
-#CONFIGURE_ARGS+= --enable-3dnow
-CONFIGURE_ARGS+= --enable-4meg-pages
-CONFIGURE_ARGS+= --enable-all-optimizations
-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-pae
-CONFIGURE_ARGS+= --enable-pci
-CONFIGURE_ARGS+= --enable-repeat-speedups
-CONFIGURE_ARGS+= --enable-sep
-CONFIGURE_ARGS+= --enable-sse=3
-CONFIGURE_ARGS+= --enable-usb
-CONFIGURE_ARGS+= --enable-vbe
+CONFIGURE_ARGS+= --enable-idle-hack
+CONFIGURE_ARGS+= --enable-a20-pin
CONFIGURE_ARGS+= --enable-x86-64
-CONFIGURE_ARGS+= --enable-popcnt
CONFIGURE_ARGS+= --enable-smp
+CONFIGURE_ARGS+= --enable-long-phy-address
+CONFIGURE_ARGS+= --enable-cpu-level=6
CONFIGURE_ARGS+= --enable-ne2000
CONFIGURE_ARGS+= --enable-acpi
+CONFIGURE_ARGS+= --enable-pci
+CONFIGURE_ARGS+= --enable-usb
+CONFIGURE_ARGS+= --enable-usb-ohci
CONFIGURE_ARGS+= --enable-pnic
-CONFIGURE_ARGS+= --enable-large-pages
-CONFIGURE_ARGS+= --enable-mtrr
+CONFIGURE_ARGS+= --enable-x2apic
+CONFIGURE_ARGS+= --enable-repeat-speedups
+CONFIGURE_ARGS+= --enable-trace-cache
+CONFIGURE_ARGS+= --enable-host-specific-asms
+CONFIGURE_ARGS+= --enable-configurable-msrs
+CONFIGURE_ARGS+= --enable-all-optimizations
+CONFIGURE_ARGS+= --enable-instrumentation
+CONFIGURE_ARGS+= --enable-vbe
CONFIGURE_ARGS+= --enable-clgd54xx
-CONFIGURE_ARGS+= --enable-sse-extension
-CONFIGURE_ARGS+= --enable-gameport
+CONFIGURE_ARGS+= --enable-fpu
+CONFIGURE_ARGS+= --enable-vmx=2
+#CONFIGURE_ARGS+= --enable-3dnow
+CONFIGURE_ARGS+= --enable-alignment-check
CONFIGURE_ARGS+= --enable-misaligned-sse
-CONFIGURE_ARGS+= --enable-aes
-CONFIGURE_ARGS+= --enable-xsave
-CONFIGURE_ARGS+= --enable-vme
+CONFIGURE_ARGS+= --enable-cdrom
+#CONFIGURE_ARGS+= --enable-gdb-stub
+CONFIGURE_ARGS+= --enable-gameport
+
+. if empty(PKG_OPTIONS:Mdebug)
+PLIST.plugins= yes
CONFIGURE_ARGS+= --enable-plugins
+. endif
. if !empty(MACHINE_PLATFORM:M*-*-i386)
CONFIGURE_ARGS+= --enable-fast-function-calls
@@ -94,6 +93,7 @@ CONFIGURE_ARGS+= --enable-sb16=osx
CONFIGURE_ARGS+= --enable-sb16=freebsd
. elif ${OPSYS} == "Linux"
CONFIGURE_ARGS+= --enable-sb16=linux
+CONFIGURE_ARGS+= --enable-pcidev
. else
CONFIGURE_ARGS+= --enable-sb16=dummy
. endif
@@ -135,6 +135,10 @@ post-install:
${RM} -rf ${PREFIX}/libexec/bochs.app/.build
${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
.else
+
+.if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
. if empty(PKG_OPTIONS:Mx11)
. include "../../mk/curses.buildlink3.mk"
. else
diff -x CVS -upNr ../emulators/bochs/PLIST bochs/PLIST
--- ../emulators/bochs/PLIST 2009-06-15 02:51:01.000000000 +0900
+++ bochs/PLIST 2010-07-06 08:34:55.000000000 +0900
@@ -1,33 +1,36 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:51:01 joerg Exp $
+@comment $NetBSD$
bin/bochs
bin/bxcommit
bin/bximage
-${PLIST.notiny}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
-${PLIST.notiny}${PLIST.x11}lib/bochs/plugins/libbx_x.la
-${PLIST.notiny}lib/bochs/plugins/libbx_acpi.la
-${PLIST.notiny}lib/bochs/plugins/libbx_biosdev.la
-${PLIST.notiny}lib/bochs/plugins/libbx_busmouse.la
-${PLIST.notiny}lib/bochs/plugins/libbx_cmos.la
-${PLIST.notiny}lib/bochs/plugins/libbx_dma.la
-${PLIST.notiny}lib/bochs/plugins/libbx_extfpuirq.la
-${PLIST.notiny}lib/bochs/plugins/libbx_floppy.la
-${PLIST.notiny}lib/bochs/plugins/libbx_gameport.la
-${PLIST.notiny}lib/bochs/plugins/libbx_harddrv.la
-${PLIST.notiny}lib/bochs/plugins/libbx_keyboard.la
-${PLIST.notiny}lib/bochs/plugins/libbx_ne2k.la
-${PLIST.notiny}lib/bochs/plugins/libbx_parallel.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci2isa.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci_ide.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pcipnic.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pciusb.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pcivga.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pic.la
-${PLIST.notiny}lib/bochs/plugins/libbx_sb16.la
-${PLIST.notiny}lib/bochs/plugins/libbx_serial.la
-${PLIST.notiny}lib/bochs/plugins/libbx_speaker.la
-${PLIST.notiny}lib/bochs/plugins/libbx_unmapped.la
-${PLIST.notiny}lib/bochs/plugins/libbx_vga.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_acpi.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_biosdev.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_busmouse.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_cmos.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_dma.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_extfpuirq.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_floppy.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_gameport.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_harddrv.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ioapic.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_keyboard.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ne2k.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_parallel.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci2isa.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci_ide.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcivga.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pic.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pit.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_sb16.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_serial.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_unmapped.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_ohci.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_uhci.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vga.la
+${PLIST.notiny}${PLIST.plugins}${PLIST.x11}lib/bochs/plugins/libbx_x.la
+${PLIST.notiny}${PLIST.plugins}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
man/man1/bochs-dlx.1
man/man1/bochs.1
man/man1/bxcommit.1
diff -x CVS -upNr ../emulators/bochs/distinfo bochs/distinfo
--- ../emulators/bochs/distinfo 2009-03-20 21:11:59.000000000 +0900
+++ bochs/distinfo 2010-07-06 06:00:21.000000000 +0900
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.24 2009/03/20 12:11:59 mishka Exp $
+$NetBSD: distinfo,v 1.23 2008/12/06 12:00:56 wiz Exp $
-SHA1 (bochs-2.3.7.tar.gz) = e687c697a8be8396ae75106d0cd6149bd52ca67d
-RMD160 (bochs-2.3.7.tar.gz) = b4c9cb8e777c4e484f653085783bce9645804fe0
-Size (bochs-2.3.7.tar.gz) = 3989982 bytes
-SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
-SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
-SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
-SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9
-SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7
-SHA1 (patch-af) = 1619912c0aa6b5504c191a78bc193b38915b4e64
+SHA1 (bochs-2.4.5.tar.gz) = e334d31efd79c80454018c9cdafaa0eb75cb018a
+RMD160 (bochs-2.4.5.tar.gz) = a5a52d8f58b8ad7b1d544d4f89043244d99fa242
+Size (bochs-2.4.5.tar.gz) = 4059598 bytes
+SHA1 (patch-aa) = 1df3de5bebdf7cfa3e323528999a90d323909db1
+SHA1 (patch-ab) = 08041c68385ff390584a515dc3a8ecb565e0f9de
+SHA1 (patch-ac) = 4037f95d235e32c7dade4c6ec5a4e27de08cdc20
+SHA1 (patch-ad) = aa9c867743b144a4b5aca76941a723247c00db2c
+SHA1 (patch-ae) = 8c182d1e689413152137bd85dcf4d973f4658b42
diff -x CVS -upNr ../emulators/bochs/patches/patch-aa bochs/patches/patch-aa
--- ../emulators/bochs/patches/patch-aa 2008-01-04 06:03:45.000000000 +0900
+++ bochs/patches/patch-aa 2010-07-06 05:17:31.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.12 2008/01/03 21:03:45 xtraeme Exp $
+$NetBSD$
---- .bochsrc.orig 2007-12-27 00:41:46.000000000 +0100
-+++ .bochsrc 2007-12-27 00:42:35.000000000 +0100
-@@ -197,13 +197,13 @@
- # 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.
+--- .bochsrc.orig 2010-04-24 09:36:03.000000000 +0000
++++ .bochsrc
+@@ -276,13 +276,13 @@ vga: extension=vbe
+ # The parameter 'type' can be used to enable the floppy drive without media
+ # and status specified. Usually the drive type is set up based on the media
type.
#=======================================================================
-floppya: 1_44=/dev/fd0, status=inserted
+@FLOPPY_LINUX@floppya: 1_44=/dev/fd0, status=inserted
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.12 2008/01/03 21:0
#=======================================================================
# FLOPPYB:
-@@ -283,7 +283,7 @@
+@@ -363,7 +363,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
#=======================================================================
diff -x CVS -upNr ../emulators/bochs/patches/patch-ab bochs/patches/patch-ab
--- ../emulators/bochs/patches/patch-ab 2006-12-05 02:37:24.000000000 +0900
+++ bochs/patches/patch-ab 2010-07-06 05:18:45.000000000 +0900
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.9 2006/12/04 17:37:24 jmmv Exp $
+$NetBSD$
---- iodev/soundosx.cc.orig 2006-03-03 21:29:50.000000000 +0100
+--- iodev/soundosx.cc.orig 2010-02-26 14:18:19.000000000 +0000
+++ iodev/soundosx.cc
-@@ -5,7 +5,7 @@
+@@ -21,7 +21,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
+ #endif
+
+ #define NO_DEVICE_INCLUDES
diff -x CVS -upNr ../emulators/bochs/patches/patch-ac bochs/patches/patch-ac
--- ../emulators/bochs/patches/patch-ac 2006-12-04 07:18:16.000000000 +0900
+++ bochs/patches/patch-ac 2010-07-06 05:23:27.000000000 +0900
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2006/12/03 22:18:16 jmmv Exp $
+$NetBSD$
---- configure.orig 2006-12-03 20:30:34.000000000 +0100
+--- configure.orig 2010-04-25 07:58:15.000000000 +0000
+++ configure
-@@ -34338,7 +34338,7 @@ fi
+@@ -33990,7 +33990,7 @@ fi
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;;
- *-macosx* | *-darwin*)
-+ *-doesntwork-macosx* | *-doesntwork-darwin*)
++ *--doesntwork-macosx* | *--doesntwork-darwin*)
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
cat >>confdefs.h <<\_ACEOF
#define HAVE_TUNTAP 1
diff -x CVS -upNr ../emulators/bochs/patches/patch-ad bochs/patches/patch-ad
--- ../emulators/bochs/patches/patch-ad 2008-01-18 19:21:01.000000000 +0900
+++ bochs/patches/patch-ad 2010-07-06 05:27:57.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2008/01/18 10:21:01 jmmv Exp $
+$NetBSD$
---- Makefile.in.orig 2007-10-22 00:07:20.000000000 +0200
+--- Makefile.in.orig 2010-02-26 14:18:18.000000000 +0000
+++ Makefile.in
-@@ -72,8 +72,8 @@ RMDIR=rmdir
+@@ -66,8 +66,8 @@ RMDIR=rmdir
TAR=tar
CHMOD=chmod
# the GZIP variable is reserved by gzip program
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.10 2008/01/18 10:2
ZIP=zip
UNIX2DOS=unix2dos
LIBTOOL=@LIBTOOL@
-@@ -576,7 +576,7 @@ RINCLUDES=/System/Library/Frameworks/Car
+@@ -561,7 +561,7 @@ RINCLUDES=/System/Library/Frameworks/Car
REZ_ARGS=-append -i $RINCLUDES -d SystemSevenOrLater=1 -useDF
STANDALONE_LIBDIR=`pwd`/$(APP)/Contents/$(APP_PLATFORM)/lib
OSACOMPILE=/usr/bin/osacompile
@@ -22,15 +22,7 @@ $NetBSD: patch-ad,v 1.10 2008/01/18 10:2
# On a MacOS X machine, you run rez, osacompile, and setfile to
# produce the script executable, which has both a data fork and a
-@@ -653,18 +653,15 @@ $(APP)/.build_plugins: $(APP)/.build boc
- $(LIBTOOL) --finish $(STANDALONE_LIBDIR);
- touch $(APP)/.build_plugins
-
--install_macosx: all download_dlx install_man @INSTALL_DOCBOOK_VAR@
-- -mkdir -p $(DESTDIR)$(prefix)
-+install_macosx: all install_man @INSTALL_DOCBOOK_VAR@
-+ -mkdir -p $(DESTDIR)$(sharedir)
- for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r
$$i $(DESTDIR)$(sharedir); else $(CPMAC) -r $(srcdir)/$$i
$(DESTDIR)$(sharedir); fi; done
+@@ -644,12 +644,9 @@ install_macosx: all download_dlx install
$(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt
-mkdir $(DESTDIR)$(sharedir)/keymaps
$(CPMAC) $(srcdir)/gui/keymaps/*.map $(DESTDIR)$(sharedir)/keymaps
diff -x CVS -upNr ../emulators/bochs/patches/patch-ae bochs/patches/patch-ae
--- ../emulators/bochs/patches/patch-ae 2008-01-18 19:21:01.000000000 +0900
+++ bochs/patches/patch-ae 2010-07-06 06:00:17.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2008/01/18 10:21:01 jmmv Exp $
+$NetBSD$
---- main.cc.orig 2007-12-21 22:16:34.000000000 +0100
+--- main.cc.orig 2010-04-24 09:36:04.000000000 +0000
+++ main.cc
-@@ -600,7 +600,7 @@ int bx_init_main(int argc, char *argv[])
+@@ -614,7 +614,7 @@ int bx_init_main(int argc, char *argv[])
}
arg++;
}
diff -x CVS -upNr ../emulators/bochs/patches/patch-af bochs/patches/patch-af
--- ../emulators/bochs/patches/patch-af 2009-03-20 21:11:26.000000000 +0900
+++ bochs/patches/patch-af 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.9 2009/03/20 12:11:26 mishka Exp $
-
---- iodev/iodebug.h.orig 2008-05-01 20:46:58.000000000 +0000
-+++ iodev/iodebug.h 2009-03-20 11:58:42.000000000 +0000
-@@ -18,7 +18,7 @@
- virtual void init(void);
- virtual void reset (unsigned type) {}
- static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len,
void *data);
-- static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len,
void *data);
-+ static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void
*data);
-
- private:
- static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);
>Unformatted:
Home |
Main Index |
Thread Index |
Old Index