diff options
| -rw-r--r-- | emulators/bochs/Makefile | 5 | ||||
| -rw-r--r-- | emulators/bochs/PLIST | 15 | ||||
| -rw-r--r-- | emulators/bochs/distinfo | 15 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-iodev_network_eth__socket.cc | 22 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-iodev_network_slirp_compat_cc | 12 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-iodev_sound_soundosx.cc | 8 |
6 files changed, 54 insertions, 23 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 826084fac9b..e66978af384 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.92 2018/11/14 22:21:25 kleink Exp $ +# $NetBSD: Makefile,v 1.93 2019/01/13 11:59:37 ryoon Exp $ -DISTNAME= bochs-2.6.8 -PKGREVISION= 8 +DISTNAME= bochs-2.6.9 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index 567fd57acca..8a723490a1c 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,10 +1,19 @@ -@comment $NetBSD: PLIST,v 1.19 2018/01/01 22:29:26 rillig Exp $ +@comment $NetBSD: PLIST,v 1.20 2019/01/13 11:59:38 ryoon Exp $ bin/bochs +bin/bxhub bin/bximage ${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_cmos.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_dma.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_fbsd.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_null.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_slirp.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_socket.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_tap.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_tuntap.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vde.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vnet.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 @@ -13,7 +22,6 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_hdimage.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_netmod.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 @@ -22,7 +30,8 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.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_serial.la -${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundmod.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_sounddummy.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundfile.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_svga_cirrus.la ${PLIST.notiny}${PLIST.plugins}${PLIST.nox11}lib/bochs/plugins/libbx_term.la diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index c0a9a655a8c..17861a6377a 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.31 2015/11/03 20:30:55 agc Exp $ +$NetBSD: distinfo,v 1.32 2019/01/13 11:59:38 ryoon Exp $ -SHA1 (bochs-2.6.8.tar.gz) = 561dc622033facb321fd9ac2e56589ae724cfdb2 -RMD160 (bochs-2.6.8.tar.gz) = cf6f9a427559c79e18c208a89e7146b6e9798ea5 -SHA512 (bochs-2.6.8.tar.gz) = 5e7438a6a09417cbc0b311810a485374bb9b10be452edd9daff0afacd487ada66f37b8189d4868d3420dae82ef6c38fe279d541d24f8a41bf1ca59359572e7bd -Size (bochs-2.6.8.tar.gz) = 5075617 bytes +SHA1 (bochs-2.6.9.tar.gz) = 1aec18479c33d9abc7a43c0fbd744eb86199c55d +RMD160 (bochs-2.6.9.tar.gz) = d437bbaa04b8bb9f3b42a51860459dcc4e308616 +SHA512 (bochs-2.6.9.tar.gz) = dfecf3a1bad07f06c2f7bb989d146e4a8eaeca493b598d415f5a4aec2a85eb5524ba417422157608c8b0828832611df487c6923c8f4ad98a147ac089fc514c46 +Size (bochs-2.6.9.tar.gz) = 5169187 bytes SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb -SHA1 (patch-iodev_network_slirp_compat_cc) = 76786b51ca1e95402ff1b2a543b00f0750bb349e -SHA1 (patch-iodev_sound_soundosx.cc) = 60ba51ac619b8149710d5ae7940ed6e4a68b36c2 +SHA1 (patch-iodev_network_eth__socket.cc) = 37c4ab50da3f646ffc541001e8a8b7c93a7995c4 +SHA1 (patch-iodev_network_slirp_compat_cc) = a48d112daac6049c0ee8076eb012ab2f44740889 +SHA1 (patch-iodev_sound_soundosx.cc) = 7dacc7df74e64d3df72a241a291f434f72722cec SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b diff --git a/emulators/bochs/patches/patch-iodev_network_eth__socket.cc b/emulators/bochs/patches/patch-iodev_network_eth__socket.cc new file mode 100644 index 00000000000..72dc232d672 --- /dev/null +++ b/emulators/bochs/patches/patch-iodev_network_eth__socket.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-iodev_network_eth__socket.cc,v 1.1 2019/01/13 11:59:38 ryoon Exp $ + +--- iodev/network/eth_socket.cc.orig 2017-03-30 18:08:15.000000000 +0000 ++++ iodev/network/eth_socket.cc +@@ -83,12 +83,14 @@ extern "C" { + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/ioctl.h> +-#include <netpacket/packet.h> + #include <netinet/in.h> +-#include <net/ethernet.h> + #include <net/if.h> +-#include <linux/types.h> + #include <netdb.h> ++#if defined(__linux__) ++#include <netpacket/packet.h> ++#include <net/ethernet.h> ++#include <linux/types.h> ++#endif + #define closesocket(s) close(s) + typedef int SOCKET; + #ifndef INVALID_SOCKET diff --git a/emulators/bochs/patches/patch-iodev_network_slirp_compat_cc b/emulators/bochs/patches/patch-iodev_network_slirp_compat_cc index 68ee13fcbcf..26c55e5183b 100644 --- a/emulators/bochs/patches/patch-iodev_network_slirp_compat_cc +++ b/emulators/bochs/patches/patch-iodev_network_slirp_compat_cc @@ -1,14 +1,14 @@ -$NetBSD: patch-iodev_network_slirp_compat_cc,v 1.1 2015/07/01 13:39:17 ryoon Exp $ +$NetBSD: patch-iodev_network_slirp_compat_cc,v 1.2 2019/01/13 11:59:38 ryoon Exp $ (At least NetBSD/amd64 7.99.1 has following problem) slirp/compat.cc:141:40: error: 'WIFEXITED' was not declared in this scope slirp/compat.cc:144:35: error: 'WEXITSTATUS' was not declared in this scope ---- iodev/network/slirp/compat.cc~ 2014-04-19 02:14:32.000000000 +0900 -+++ iodev/network/slirp/compat.cc 2014-12-12 01:01:35.000000000 +0900 -@@ -27,6 +27,10 @@ - - #include "slirp.h" +--- iodev/network/slirp/compat.cc.orig 2016-08-12 17:06:14.000000000 +0000 ++++ iodev/network/slirp/compat.cc +@@ -35,6 +35,10 @@ + # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) + #endif +#ifdef __NetBSD__ +# include "sys/wait.h" diff --git a/emulators/bochs/patches/patch-iodev_sound_soundosx.cc b/emulators/bochs/patches/patch-iodev_sound_soundosx.cc index 64167609628..7ea8413cd7e 100644 --- a/emulators/bochs/patches/patch-iodev_sound_soundosx.cc +++ b/emulators/bochs/patches/patch-iodev_sound_soundosx.cc @@ -1,9 +1,9 @@ -$NetBSD: patch-iodev_sound_soundosx.cc,v 1.1 2012/10/01 13:40:48 ryoon Exp $ +$NetBSD: patch-iodev_sound_soundosx.cc,v 1.2 2019/01/13 11:59:38 ryoon Exp $ ---- iodev/sound/soundosx.cc.orig 2012-09-02 11:30:10.000000000 +0000 +--- iodev/sound/soundosx.cc.orig 2017-03-14 18:21:05.000000000 +0000 +++ iodev/sound/soundosx.cc -@@ -21,7 +21,7 @@ - // This file (SOUNDOSX.CC) written and donated by Brian Huffman +@@ -26,7 +26,7 @@ + #define BX_PLUGGABLE #ifdef PARANOID -#include <MacTypes.h> |