From fcad3a1b97cde963cf2ad2433d48d0bc10881bbc Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Wed, 18 Jun 2014 07:37:32 +0000 Subject: - Update to 2.6.5 PR: 190897 --- emulators/bochs/Makefile | 258 ++++++++++----------- emulators/bochs/distinfo | 4 +- .../bochs/files/patch-iodev__network__eth_fbsd.cc | 17 -- .../files/patch-iodev__network__slurp__compat.cc | 11 + emulators/bochs/pkg-plist | 6 +- 5 files changed, 135 insertions(+), 161 deletions(-) delete mode 100644 emulators/bochs/files/patch-iodev__network__eth_fbsd.cc create mode 100644 emulators/bochs/files/patch-iodev__network__slurp__compat.cc (limited to 'emulators/bochs') diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index d4bb26c6fe40..b7de3ca8a70e 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bochs -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.6 PORTEPOCH= 2 CATEGORIES= emulators MASTER_SITES= SF @@ -12,179 +12,145 @@ COMMENT= IA-32 (x86) PC emulator that runs DOS, Win 95, and more LICENSE= LGPL21 -OPTIONS_DEFINE= A20_PIN ALIGN_CHECK ASSERT_CHECK AVX \ - CDROM CHAINING CLGD54XX CONF_MSRS CPP_SUFX \ - DISASM DOCS \ - E1000 ES1370 FPU \ - GAMEPORT IDLE_HACK IODEBUG \ - LARGE_RAMFILE LOGGING LONG_PHY_ADDR \ - MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \ - RAW_SERIAL READLINE REPEAT_SPEED RFB \ - SB16 SDL SHOW_IPS SMP SVGALIB SVM TERM USB USB_OHCI USB_XHCI \ - VMX VOODOO WXGTK X11 X86_64 XPM -OPTIONS_DEFINE_i386= FAST_FUNCCALL -OPTIONS_RADIO= DEBUG -OPTIONS_RADIO_DEBUG= DEBUGGER GDB_STUB -OPTIONS_DEFAULT=A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING \ - NE2000 OPTIMIZATIONS SB16 X11 - -A20_PIN_DESC= Enable support for A20 pin -ALIGN_CHECK_DESC= Enable alignment check support -ASSERT_CHECK_DESC= Enable BX_ASSERT checks -AVX_DESC= Enable AVX instructions support -CDROM_DESC= Enable CDROM support -CHAINING_DESC= Enable handlers-chaining emulation speedups -CLGD54XX_DESC= Enable Cirrus Logic GD54xx video card -CONF_MSRS_DESC= Enable configurable MSR registers support -CPP_SUFX_DESC= Use .cpp as C++ suffix -DEBUG_DESCR= Enable Debugging, select this and one of DEBUGGER or GDB_STUB (or none) -DEBUGGER_DESC= Enable debugger support -DEBUGGER_X86_DESC= Enable x86 hardware debugger -DISASM_DESC= Enable disassemler support -E1000_DESC= Enable Intel(R) Gigabit Ethernet support -ES1370_DESC= Enable ES1370 soundcard support -FAST_FUNCCALL_DESC= Enable fast function calls support (x86 only) -FPU_DESC= Enable FPU emulator -GAMEPORT_DESC= Enable standard PC gameport support -GDB_STUB_DESC= Enable GDB stub support -IDLE_HACK_DESC= Keep Bochs from using all CPU time -IODEBUG_DESC= Enable I/O interface to debugger -LARGE_RAMFILE_DESC= Enable large ramfile support -LOGGING_DESC= Enable logging -LONG_PHY_ADDR_DESC= Enable support for physical address >= 32bit -MWAIT_DESC= Enable experimental MONITOR/MWAIT support -NE2000_DESC= Enable ne2000 support -OPTIMIZATIONS_DESC= Enable all safe speed optimizations -PCI_DESC= Enable i440FX PCI support -PLUGINS_DESC= Enable building dynamic loadable plugins -PNIC_DESC= Enable PCI pseudo NIC (network card) support -RAW_SERIAL_DESC= Use raw serial port access -READLINE_DESC= Enable readline support in debugger -REPEAT_SPEED_DESC= Enable repeated IO and mem copy speedups -RFB_DESC= Enable VNC server support in display -SB16_DESC= Enable Sound Blaster 16 emulation -SHOW_IPS_DESC= Enable logging of measured IPS -SMP_DESC= Enable SMP simulation support (CPU level 6) -SVM_DESC= Enable SVM (AMD: secure virtual machine) emulation -TERM_DESC= Use text only, console based interface -USB_DESC= Enable USB UHCI support -USB_OHCI_DESC= Enable USB OHCI support -USB_XHCI_DESC= Enable experimental USB xHCI support -VMX_DESC= Enable Virtialization extensions -VOODOO_DESC= Enable 3dfx Voodoo Graphics emulation -X86_64_DESC= Enable x86-64 instructions support - -USES= gmake pkgconfig libtool +USES= gmake libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_alsa_asoundlib_h=no CONFIGURE_ARGS= --disable-docbook --disable-instrumentation +SUB_FILES= pkg-message + CFLAGS+= -fno-exceptions -fomit-frame-pointer ${CPPFLAGS} CXXFLAGS+= -fno-rtti CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -SUB_FILES= pkg-message +OPTIONS_DEFINE= A20_PIN ALIGN_CHECK ASSERT_CHECK AVX BUSMOUSE \ + CDROM CHAINING CLGD54XX CONF_MSRS CPP_SUFX \ + DISASM DOCS \ + E1000 ES1370 EVEX FPU \ + GAMEPORT IDLE_HACK IODEBUG \ + LARGE_RAMFILE LOGGING LONG_PHY_ADDR \ + MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \ + RAW_SERIAL READLINE REPEAT_SPEED RFB \ + SB16 SDL SHOW_IPS SMP SVGALIB SVM \ + TERM TRACE_LINK \ + USB USB_OHCI USB_XHCI \ + VMX VNCSERVER VOODOO WXGTK X11 X86_64 XPM +OPTIONS_DEFINE_i386= FAST_FUNCCALL +OPTIONS_RADIO= DEBUG +OPTIONS_RADIO_DEBUG= DEBUGGER GDB_STUB +OPTIONS_DEFAULT= A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU \ + LOGGING NE2000 OPTIMIZATIONS SB16 X11 +A20_PIN_DESC= Enable support for A20 pin A20_PIN_CONFIGURE_ENABLE= a20-pin - +ALIGN_CHECK_DESC= Enable alignment check support ALIGN_CHECK_CONFIGURE_ENABLE= alignment-check - +ASSERT_CHECK_DESC= Enable BX_ASSERT checks ASSERT_CHECK_CONFIGURE_ENABLE= assert-checks - +AVX_DESC= Enable AVX instructions support AVX_CONFIGURE_ENABLE= avx - +BUSMOUSE_DESC= Enable Busmouse support +BUSMOUSE_CONFIGURE_ENABLE= busmouse +CDROM_DESC= Enable CDROM support CDROM_CONFIGURE_ENABLE= cdrom - +CHAINING_DESC= Enable handlers-chaining emulation speedups CHAINING_CONFIGURE_ENABLE= handlers-chaining - +CLGD54XX_DESC= Enable Cirrus Logic GD54xx video card CLGD54XX_CONFIGURE_ENABLE= clgd54xx - +CONF_MSRS_DESC= Enable configurable MSR registers support CONF_MSRS_CONFIGURE_ENABLE= configurable-msrs - +CPP_SUFX_DESC= Use .cpp as C++ suffix CPP_SUFX_CONFIGURE_ENABLE= cpp - +DEBUG_DESCR= Enable Debugging, select this and one of DEBUGGER or GDB_STUB (or none) +DEBUGGER_DESC= Enable debugger support DEBUGGER_CONFIGURE_ENABLE= debugger - +DEBUGGER_X86_DESC= Enable x86 hardware debugger DEBUGGER_X86_CONFIGURE_ENABLE= x86-debugger - +DISASM_DESC= Enable disassemler support DISASM_CONFIGURE_ENABLE= disasm - +E1000_DESC= Enable Intel(R) Gigabit Ethernet support E1000_CONFIGURE_ENABLE= e1000 - +ES1370_DESC= Enable ES1370 soundcard support ES1370_CONFIGURE_ENABLE= es1370 - +EVEX_DESC= Enable EVEX prefix and AVX-512 extensios support +EVEX_CONFIGURE_ENABLE= evex +FAST_FUNCCALL_DESC= Enable fast function calls support (x86 only) FAST_FUNCCALL_CONFIGURE_ENABLE= fast-function-calls - +FPU_DESC= Enable FPU emulator FPU_CONFIGURE_ENABLE= fpu - +GAMEPORT_DESC= Enable standard PC gameport support GAMEPORT_CONFIGURE_ENABLE= gameport - +GDB_STUB_DESC= Enable GDB stub support GDB_STUB_CONFIGURE_ENABLE= gdb-stub - +IDLE_HACK_DESC= Keep Bochs from using all CPU time IDLE_HACK_CONFIGURE_ENABLE= idle-hack - +IODEBUG_DESC= Enable I/O interface to debugger IODEBUG_CONFIGURE_ENABLE= iodebug - +LARGE_RAMFILE_DESC= Enable large ramfile support LARGE_RAMFILE_CONFIGURE_ENABLE= large-ramfile - +LOGGING_DESC= Enable logging LOGGING_CONFIGURE_ENABLE= logging - +LONG_PHY_ADDR_DESC= Enable support for physical address >= 32bit LONG_PHY_ADDR_CONFIGURE_ENABLE= long-phy-address - +MWAIT_DESC= Enable experimental MONITOR/MWAIT support MWAIT_CONFIGURE_ENABLE= monitor-mwait - +NE2000_DESC= Enable ne2000 support NE2000_CONFIGURE_ENABLE= ne2000 - +OPTIMIZATIONS_DESC= Enable all safe speed optimizations OPTIMIZATIONS_CONFIGURE_ENABLE= all-optimizations - +PCI_DESC= Enable i440FX PCI support PCI_CONFIGURE_ENABLE= pci - +PLUGINS_DESC= Enable building dynamic loadable plugins PLUGINS_CONFIGURE_ENABLE= plugins - +PNIC_DESC= Enable PCI pseudo NIC (network card) support PNIC_CONFIGURE_ENABLE= pnic - +RAW_SERIAL_DESC= Use raw serial port access RAW_SERIAL_CONFIGURE_ENABLE= raw-serial - -READLINE_USES= readline +READLINE_DESC= Enable readline support in debugger +READLINE_USES= readline READLINE_CONFIGURE_ENABLE= readline - +REPEAT_SPEED_DESC= Enable repeated IO and mem copy speedups REPEAT_SPEED_CONFIGURE_ENABLE= repeat-speedups - -RFB_CONFIGURE_WITH= rfb - -SB16_CONFIGURE_ENABLE= sb16 - -SDL_USE= SDL=sdl -SDL_CONFIGURE_WITH= sdl - +RFB_DESC= Use RFB protocol (works with VNC viewer) +RFB_CONFIGURE_WITH= rfb +SB16_DESC= Enable Sound Blaster 16 emulation +SB16_CONFIGURE_ENABLE= sb16 +SDL_USE= SDL=sdl +SDL_CONFIGURE_WITH= sdl +SHOW_IPS_DESC= Enable logging of measured IPS SHOW_IPS_CONFIGURE_ENABLE= show-ips - -SMP_CONFIGURE_ENABLE= smp - -SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib -SVGALIB_CONFIGURE_WITH= svga - -SVM_CONFIGURE_ENABLE= svm - -TERM_CONFIGURE_WITH= term - -USB_CONFIGURE_ENABLE= usb - +SMP_DESC= Enable SMP simulation support (CPU level 6) +SMP_CONFIGURE_ENABLE= smp +SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib +SVGALIB_CONFIGURE_WITH= svga +SVM_DESC= Enable SVM (AMD: secure virtual machine) emulation +SVM_CONFIGURE_ENABLE= svm +TERM_DESC= Use text only, console based interface +TERM_CONFIGURE_WITH= term +TRACE_LINK_DESC= Enable trace linking speedups +TRACE_LINK_CONFIGURE_ENABLE= trace-linking +USB_DESC= Enable USB UHCI support +USB_CONFIGURE_ENABLE= usb +USB_OHCI_DESC= Enable USB OHCI support USB_OHCI_CONFIGURE_ENABLE= usb-ohci - +USB_XHCI_DESC= Enable experimental USB xHCI support USB_XHCI_CONFIGURE_ENABLE= usb-xhci - +VMX_DESC= Enable Virtialization extensions +VNCSERVER_DESC= Use LibVNCServer (works with VNC viewer) +VNCSERVER_LIB_DEPENDS= libvncserver.so:${PORTSDIR}/net/libvncserver +VNCSERVER_CONFIGURE_WITH= vncsrv +VOODOO_DESC= Enable 3dfx Voodoo Graphics emulation VOODOO_CONFIGURE_ENABLE= voodoo - -WXGTK_USE= WX=2.4+ -WXGTK_CONFIGURE_WITH= wx -WXGTK_CONFIGURE_OFF= --disable-debugger-gui - -X11_USE= XORG=xrandr -X11_CONFIGURE_WITH= x11 - +WXGTK_USE= WX=2.8 +WXGTK_CONFIGURE_WITH= wx +WXGTK_CONFIGURE_OFF= --disable-debugger-gui +X11_USE= XORG=xrandr +X11_CONFIGURE_WITH= x11 +X86_64_DESC= Enable x86-64 instructions support X86_64_CONFIGURE_ENABLE= x86-64 +XPM_USE= XORG=xpm +XOM_CONFIGURE_ENABE= xpm .include @@ -214,13 +180,6 @@ WITH_CPU_LEVEL= 6 WITH_CPU_LEVEL= 6 .endif -.if ${PORT_OPTIONS:MXPM} && ${PORT_OPTIONS:MX11} -USE_XORG+= xpm -CONFIGURE_ARGS+=--enable-xpm -.else -CONFIGURE_ARGS+=--disable-xpm -.endif - .if defined(WITH_CPU_LEVEL) .if ${WITH_CPU_LEVEL} < 3 || ${WITH_CPU_LEVEL} > 6 IGNORE= can not install: WITH_CPU_LEVEL must be an integer value between 3 and 6 @@ -232,6 +191,10 @@ CONFIGURE_ARGS+=--enable-cpu-level=${WITH_CPU_LEVEL} IGNORE= GDB_STUB is incompatible with multiprocessor .endif +.if ${PORT_OPTIONS:ME1000} && empty(PORT_OPTIONS:MPCI) +IGNORE= E1000 network adapter support requires PCI support +.endif + .if ${PORT_OPTIONS:MES1370} && empty(PORT_OPTIONS:MGAMEPORT) IGNORE= ES1370 soundcard support requires GAMEPORT support .endif @@ -240,6 +203,10 @@ IGNORE= ES1370 soundcard support requires GAMEPORT support IGNORE= ES1370 soundcard support requires PCI support .endif +.if ${PORT_OPTIONS:MEVEX} && empty(PORT_OPTIONS:MAVX) +IGNORE= EVEX instructions support requires AVX support +.endif + .if ${PORT_OPTIONS:MPNIC} && empty(PORT_OPTIONS:MPCI) IGNORE= PCI pseudo NIC support requires PCI support .endif @@ -256,6 +223,10 @@ IGNORE= AVX instructions support requires X86-64 support IGNORE= SVM emulation requires X86-64 support .endif +.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MX11) +IGNORE= XPM support requires X11 support +.endif + pre-everything:: .if !defined(WITH_CPU_LEVEL) @${ECHO_CMD} @@ -287,8 +258,11 @@ post-patch: s|(-lvgagl)$$|\1 @LDFLAGS@|' \ ${WRKSRC}/gui/Makefile.in +post-build: + @${LN} -sf .bochsrc ${WRKSRC}/bochsrc-sample.txt + post-install: -.for f in bochs bxcommit bximage +.for f in bochs bxcommit bximage bximage_old ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .if ${PORT_OPTIONS:MPLUGINS} @@ -298,12 +272,14 @@ post-install: ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/CHANGES - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README - ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}/TODO - ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${STAGEDIR}${DOCSDIR}/bochsrc-sample.txt - ${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${STAGEDIR}${DOCSDIR} +.for i in CHANGES README TODO bochsrc-sample.txt + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR}) +.endfor + (cd ${WRKSRC}/docs-html && ${INSTALL_DATA} *.txt \ + ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - ${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${STAGEDIR}${DOCSDIR}/html + (cd ${WRKSRC}/docs-html && ${INSTALL_DATA} *.html \ + ${STAGEDIR}${DOCSDIR}/html) .include diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 4cf86e74e432..8b9ecec5917a 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,2 +1,2 @@ -SHA256 (bochs-2.6.2.tar.gz) = d973b72b79a5de96ebe9337b8421f19dcd775dce16ed25a0232fa6d543a54b10 -SIZE (bochs-2.6.2.tar.gz) = 4314061 +SHA256 (bochs-2.6.6.tar.gz) = cef4f8cf0620b8a8a51bc45620403ea953a5bf165c19624ffa7ba48e82a0995a +SIZE (bochs-2.6.6.tar.gz) = 5012543 diff --git a/emulators/bochs/files/patch-iodev__network__eth_fbsd.cc b/emulators/bochs/files/patch-iodev__network__eth_fbsd.cc deleted file mode 100644 index 70d52896e3f7..000000000000 --- a/emulators/bochs/files/patch-iodev__network__eth_fbsd.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- iodev/network/eth_fbsd.cc.orig 2012-09-02 20:30:11.000000000 +0900 -+++ iodev/network/eth_fbsd.cc 2012-09-03 23:41:03.000000000 +0900 -@@ -235,6 +235,14 @@ - return; - } - -+ v = 1; -+ if (ioctl(this->bpf_fd, BIOCIMMEDIATE, &v) < 0) { -+ BX_PANIC(("eth_freebsd: could not enable immediate mode")); -+ close(this->bpf_fd); -+ this->bpf_fd = -1; -+ return; -+ } -+ - // Set up non-blocking i/o - v = 1; - if (ioctl(this->bpf_fd, FIONBIO, &v) < 0) { diff --git a/emulators/bochs/files/patch-iodev__network__slurp__compat.cc b/emulators/bochs/files/patch-iodev__network__slurp__compat.cc new file mode 100644 index 000000000000..1d3d2514f396 --- /dev/null +++ b/emulators/bochs/files/patch-iodev__network__slurp__compat.cc @@ -0,0 +1,11 @@ +--- iodev/network/slirp/compat.cc.orig ++++ iodev/network/slirp/compat.cc +@@ -127,6 +127,8 @@ + #define CONFIG_SMBD_COMMAND "/usr/sbin/smbd" + + #include ++#include ++#include + + /* automatic user mode samba server configuration */ + void slirp_smb_cleanup(Slirp *s, char *smb_tmpdir) diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist index a09200e93bfd..855cea8b77f3 100644 --- a/emulators/bochs/pkg-plist +++ b/emulators/bochs/pkg-plist @@ -1,13 +1,16 @@ bin/bochs bin/bxcommit bin/bximage -man/man1/bochs-dlx.1.gz +bin/bximage_old man/man1/bochs.1.gz +man/man1/bochs-dlx.1.gz man/man1/bxcommit.1.gz man/man1/bximage.1.gz +man/man1/bximage_old.1.gz man/man5/bochsrc.5.gz %%DATADIR%%/BIOS-bochs-latest %%DATADIR%%/BIOS-bochs-legacy +%%DATADIR%%/SeaBIOS-README %%DATADIR%%/VGABIOS-elpin-2.40 %%DATADIR%%/VGABIOS-elpin-LICENSE %%DATADIR%%/VGABIOS-lgpl-README @@ -15,6 +18,7 @@ man/man5/bochsrc.5.gz %%DATADIR%%/VGABIOS-lgpl-latest-cirrus %%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug %%DATADIR%%/VGABIOS-lgpl-latest-debug +%%DATADIR%%/bios.bin-1.7.5 %%DATADIR%%/keymaps/sdl-pc-de.map %%DATADIR%%/keymaps/sdl-pc-us.map %%DATADIR%%/keymaps/x11-pc-be.map -- cgit v1.2.3