cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to bochs-2.6.8.

Browse Source 
from brad
This commit is contained in:
ajacoutot 2015-05-10 08:01:58 +00:00
parent 191922623a
commit 74ad2e61ba
12 changed files with 116 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/bochs/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.65 2015/04/09 20:09:35 sthen Exp $
# $OpenBSD: Makefile,v 1.66 2015/05/10 08:01:58 ajacoutot Exp $
COMMENT= x86 machine simulator
DISTNAME= bochs-2.6.7
REVISION= 0
DISTNAME= bochs-2.6.8
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}

4
emulators/bochs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bochs-2.6.7.tar.gz) = pDVO62mWYtqGmwOOIlFg7HJriD8bT0JaBs9Wy/+7goI=
SIZE (bochs-2.6.7.tar.gz) = 5045466
SHA256 (bochs-2.6.8.tar.gz) = eXAO8JFKCXP2LZkI/3AO9972LUoo7V3kGO9h81dlhc4=
SIZE (bochs-2.6.8.tar.gz) = 5075617

8
emulators/bochs/patches/patch-Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.8 2014/11/04 06:01:41 brad Exp $
$OpenBSD: patch-Makefile_in,v 1.9 2015/05/10 08:01:58 ajacoutot Exp $
Don't gzip the man pages.
--- Makefile.in.orig Sat Jul 26 02:54:34 2014
+++ Makefile.in Tue Nov 4 00:08:55 2014
@@ -466,8 +466,8 @@ clean_docbook::
--- 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::
install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)

12
emulators/bochs/patches/patch-_bochsrc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-_bochsrc,v 1.12 2014/11/04 06:01:41 brad Exp $
--- .bochsrc.orig Sun Oct 19 04:54:16 2014
+++ .bochsrc Tue Nov 4 00:08:55 2014
@@ -559,7 +559,7 @@ pci: enabled=1, chipset=i440fx
$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
#
# Default value are sync=none, rtc_sync=0, time0=local
#=======================================================================
@ -10,7 +10,7 @@ $OpenBSD: patch-_bochsrc,v 1.12 2014/11/04 06:01:41 brad Exp $
#=======================================================================
# CMOSIMAGE:
@@ -614,13 +614,13 @@ private_colormap: enabled=0
@@ -623,13 +623,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.12 2014/11/04 06:01:41 brad Exp $
#=======================================================================
# FLOPPYB:
@@ -745,8 +745,8 @@ floppy_bootsig_check: disabled=0
@@ -755,8 +755,8 @@ floppy_bootsig_check: disabled=0
# log: ./bochs.out
# log: /dev/tty
#=======================================================================

51
emulators/bochs/patches/patch-gui_term_cc Normal file
View File

@ -0,0 +1,51 @@
$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

14
emulators/bochs/patches/patch-iodev_hdimage_hdimage_cc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-iodev_hdimage_hdimage_cc,v 1.1 2015/04/09 20:09:35 sthen Exp $
Fixed bximage compilation on big endian hosts.
--- iodev/hdimage/hdimage.cc.orig Fri Mar 20 18:59:32 2015
+++ iodev/hdimage/hdimage.cc Fri Mar 20 18:59:58 2015
@@ -28,6 +28,7 @@
#include "config.h"
#include "misc/bxcompat.h"
#include "osdep.h"
+#include "misc/bswap.h"
#else
#include "iodev.h"
#include "cdrom.h"

14
emulators/bochs/patches/patch-iodev_hdimage_vmware3_cc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-iodev_hdimage_vmware3_cc,v 1.1 2015/04/09 20:09:35 sthen Exp $
Fixed bximage compilation on big endian hosts.
--- iodev/hdimage/vmware3.cc.orig Fri Mar 20 19:00:20 2015
+++ iodev/hdimage/vmware3.cc Fri Mar 20 19:00:40 2015
@@ -35,6 +35,7 @@
#include "config.h"
#include "misc/bxcompat.h"
#include "osdep.h"
+#include "misc/bswap.h"
#else
#include "iodev.h"
#endif

14
emulators/bochs/patches/patch-iodev_hdimage_vmware4_cc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-iodev_hdimage_vmware4_cc,v 1.1 2015/04/09 20:09:35 sthen Exp $
Fixed bximage compilation on big endian hosts.
--- iodev/hdimage/vmware4.cc.orig Fri Mar 20 19:00:54 2015
+++ iodev/hdimage/vmware4.cc Fri Mar 20 19:01:03 2015
@@ -36,6 +36,7 @@
#include "config.h"
#include "misc/bxcompat.h"
#include "osdep.h"
+#include "misc/bswap.h"
#else
#include "iodev.h"
#endif

18
emulators/bochs/patches/patch-iodev_network_slirp_slirp_h
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-iodev_network_slirp_slirp_h,v 1.1 2014/11/04 06:01:41 brad Exp $
slirp/cksum.cc:83: error: 'uintptr_t' was not declared in this scope
slirp/compat.cc:141: error: 'WIFEXITED' was not declared in this scope
slirp/compat.cc:144: error: 'WEXITSTATUS' was not declared in this scope
--- iodev/network/slirp/slirp.h.orig Tue Nov 4 00:14:00 2014
+++ iodev/network/slirp/slirp.h Tue Nov 4 00:19:24 2014
@@ -33,6 +33,8 @@ typedef char *caddr_t;
#endif
#include <sys/types.h>
+#include <stdint.h>
+#include <sys/wait.h>
#ifdef HAVE_SYS_BITYPES_H
# include <sys/bitypes.h>
#endif

17
emulators/bochs/patches/patch-iodev_sound_soundfile_cc Normal file
View File

@ -0,0 +1,17 @@
$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

17
emulators/bochs/patches/patch-iodev_sound_soundlow_cc Normal file
View File

@ -0,0 +1,17 @@
$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;

17
emulators/bochs/patches/patch-iodev_sound_soundlow_h Normal file
View File

@ -0,0 +1,17 @@
$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