Update to bochs-2.6.9.
from Brad
This commit is contained in:
ajacoutot
parent
1809344e66
commit
72b3ad1c60
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.68 2017/04/10 11:45:27 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.69 2017/04/23 13:25:29 ajacoutot Exp $
|
||||
|
||||
COMMENT= x86 machine simulator
|
||||
|
||||
DISTNAME= bochs-2.6.8
|
||||
DISTNAME= bochs-2.6.9
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (bochs-2.6.8.tar.gz) = eXAO8JFKCXP2LZkI/3AO9972LUoo7V3kGO9h81dlhc4=
|
||||
SIZE (bochs-2.6.8.tar.gz) = 5075617
|
||||
SHA256 (bochs-2.6.9.tar.gz) = 7ltnf9mxufSEta60YU9D3yGZMIjAwFcRh/k6ywhm6Yw=
|
||||
SIZE (bochs-2.6.9.tar.gz) = 5169187
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.9 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
$OpenBSD: patch-Makefile_in,v 1.10 2017/04/23 13:25:29 ajacoutot Exp $
|
||||
|
||||
Don't gzip the man pages.
|
||||
|
||||
--- Makefile.in.orig Sun Mar 29 10:27:32 2015
|
||||
+++ Makefile.in Fri May 8 15:06:13 2015
|
||||
@@ -460,8 +460,8 @@ clean_docbook::
|
||||
--- Makefile.in.orig Sat Mar 18 05:27:48 2017
|
||||
+++ Makefile.in Tue Apr 11 21:57:44 2017
|
||||
@@ -471,8 +471,8 @@ clean_docbook::
|
||||
install_man::
|
||||
-mkdir -p $(DESTDIR)$(man1dir)
|
||||
-mkdir -p $(DESTDIR)$(man5dir)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-_bochsrc,v 1.13 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
--- .bochsrc.orig Sat May 2 11:40:11 2015
|
||||
+++ .bochsrc Fri May 8 15:06:13 2015
|
||||
@@ -568,7 +568,7 @@ pci: enabled=1, chipset=i440fx
|
||||
$OpenBSD: patch-_bochsrc,v 1.14 2017/04/23 13:25:29 ajacoutot Exp $
|
||||
--- .bochsrc.orig Sun Apr 2 11:43:48 2017
|
||||
+++ .bochsrc Tue Apr 11 21:57:44 2017
|
||||
@@ -571,7 +571,7 @@ pci: enabled=1, chipset=i440fx
|
||||
#
|
||||
# Default value are sync=none, rtc_sync=0, time0=local
|
||||
#=======================================================================
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-_bochsrc,v 1.13 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
#=======================================================================
|
||||
# CMOSIMAGE:
|
||||
@@ -623,13 +623,13 @@ private_colormap: enabled=0
|
||||
@@ -627,13 +627,13 @@ private_colormap: enabled=0
|
||||
# The optional parameter 'write_protected' can be used to control the media
|
||||
# write protect switch. By default it is turned off.
|
||||
#=======================================================================
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.13 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
#=======================================================================
|
||||
# FLOPPYB:
|
||||
@@ -755,8 +755,8 @@ floppy_bootsig_check: disabled=0
|
||||
@@ -759,8 +759,8 @@ floppy_bootsig_check: disabled=0
|
||||
# log: ./bochs.out
|
||||
# log: /dev/tty
|
||||
#=======================================================================
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
$OpenBSD: patch-gui_term_cc,v 1.6 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
Attempt to fix the compilation failure on OpenBSD with debugger enabled
|
||||
|
||||
--- gui/term.cc.orig Sat May 9 13:27:46 2015
|
||||
+++ gui/term.cc Sat May 9 13:29:33 2015
|
||||
@@ -33,6 +33,8 @@ extern "C" {
|
||||
#include <signal.h>
|
||||
};
|
||||
|
||||
+#define BX_DEBUGGER_TERM (BX_DEBUGGER && !defined(__OpenBSD__))
|
||||
+
|
||||
class bx_term_gui_c : public bx_gui_c {
|
||||
public:
|
||||
bx_term_gui_c(void) {}
|
||||
@@ -50,7 +52,7 @@ class bx_term_gui_c : public bx_gui_c { (public)
|
||||
// declare one instance of the gui object and call macro to insert the
|
||||
// plugin code
|
||||
static bx_term_gui_c *theGui = NULL;
|
||||
-#if BX_DEBUGGER
|
||||
+#if BX_DEBUGGER_TERM
|
||||
static int scr_fd = -1;
|
||||
#endif
|
||||
IMPLEMENT_GUI_PLUGIN_CODE(term)
|
||||
@@ -183,7 +185,7 @@ void bx_term_gui_c::specific_init(int argc, char **arg
|
||||
|
||||
// the ask menu causes trouble
|
||||
io->set_log_action(LOGLEV_PANIC, ACT_FATAL);
|
||||
-#if !BX_DEBUGGER
|
||||
+#if !BX_DEBUGGER_TERM
|
||||
// logfile should be different from stderr, otherwise terminal mode
|
||||
// really ends up having fun
|
||||
if (!strcmp(SIM->get_param_string(BXPN_LOG_FILENAME)->getptr(), "-"))
|
||||
@@ -200,7 +202,7 @@ void bx_term_gui_c::specific_init(int argc, char **arg
|
||||
}
|
||||
#endif
|
||||
initscr();
|
||||
-#if BX_DEBUGGER
|
||||
+#if BX_DEBUGGER_TERM
|
||||
stdin = old_stdin;
|
||||
stdout = old_stdout;
|
||||
#endif
|
||||
@@ -793,7 +795,7 @@ void bx_term_gui_c::replace_bitmap(unsigned hbar_id, u
|
||||
void bx_term_gui_c::exit(void)
|
||||
{
|
||||
if (!initialized) return;
|
||||
-#if BX_DEBUGGER
|
||||
+#if BX_DEBUGGER_TERM
|
||||
if(scr_fd > 0)
|
||||
close(scr_fd);
|
||||
#endif
|
||||
21
emulators/bochs/patches/patch-iodev_network_eth_socket_cc
Normal file
21
emulators/bochs/patches/patch-iodev_network_eth_socket_cc
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-iodev_network_eth_socket_cc,v 1.1 2017/04/23 13:25:29 ajacoutot Exp $
|
||||
--- iodev/network/eth_socket.cc.orig Tue Apr 11 22:08:35 2017
|
||||
+++ iodev/network/eth_socket.cc Tue Apr 11 22:10:14 2017
|
||||
@@ -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>
|
||||
+#ifdef __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
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-iodev_sound_soundfile_cc,v 1.1 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
Include pthreads library header in soundlow.h (fixes SF bug #1373).
|
||||
|
||||
--- iodev/sound/soundfile.cc.orig Sat May 9 07:36:08 2015
|
||||
+++ iodev/sound/soundfile.cc Sat May 9 07:36:25 2015
|
||||
@@ -32,10 +32,6 @@
|
||||
|
||||
#if BX_SUPPORT_SOUNDLOW
|
||||
|
||||
-#ifndef WIN32
|
||||
-#include <pthread.h>
|
||||
-#endif
|
||||
-
|
||||
#define BX_SOUNDFILE_RAW 0
|
||||
#define BX_SOUNDFILE_VOC 1
|
||||
#define BX_SOUNDFILE_WAV 2
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-iodev_sound_soundlow_cc,v 1.1 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
Include pthreads library header in soundlow.h (fixes SF bug #1373).
|
||||
|
||||
--- iodev/sound/soundlow.cc.orig Sat May 9 07:36:49 2015
|
||||
+++ iodev/sound/soundlow.cc Sat May 9 07:36:58 2015
|
||||
@@ -31,10 +31,6 @@
|
||||
|
||||
#include "soundlow.h"
|
||||
|
||||
-#ifndef WIN32
|
||||
-#include <pthread.h>
|
||||
-#endif
|
||||
-
|
||||
// audio buffer support
|
||||
|
||||
static audio_buffer_t *audio_buffers = NULL;
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-iodev_sound_soundlow_h,v 1.1 2015/05/10 08:01:58 ajacoutot Exp $
|
||||
|
||||
Include pthreads library header in soundlow.h (fixes SF bug #1373).
|
||||
|
||||
--- iodev/sound/soundlow.h.orig Sat May 9 07:37:12 2015
|
||||
+++ iodev/sound/soundlow.h Sat May 9 07:37:40 2015
|
||||
@@ -20,6 +20,10 @@
|
||||
|
||||
// Common code for sound lowlevel modules
|
||||
|
||||
+#ifndef WIN32
|
||||
+#include <pthread.h>
|
||||
+#endif
|
||||
+
|
||||
// This is the maximum size of a wave data packet.
|
||||
// It should be large enough for 0.1 seconds of playback or recording.
|
||||
#define BX_SOUNDLOW_WAVEPACKETSIZE 19200
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.23 2014/11/04 06:01:41 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.24 2017/04/23 13:25:29 ajacoutot Exp $
|
||||
@bin bin/bochs
|
||||
@bin bin/bxhub
|
||||
@bin bin/bximage
|
||||
@man man/man1/bochs-dlx.1
|
||||
@man man/man1/bochs.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user