groups/231.native_packages_etc.group: bochs: bump to v2.6.11

Signed-off-by: Ørjan Malde <red@foxi.me>

2 files changed, 65 insertions, 3 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 755ccf3a..a294e2db 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -38,9 +38,9 @@ zstd")";
 : ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
 : ${PKG_BMAKE_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_BOCHS_DEPENDS:="curl ncurses"};
-: ${PKG_BOCHS_SHA256SUM:=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c};
-: ${PKG_BOCHS_VERSION:=2.6.9};
-: ${PKG_BOCHS_URL:=https://sources.voidlinux.org/bochs-${PKG_BOCHS_VERSION}/bochs-${PKG_BOCHS_VERSION}.tar.gz};
+: ${PKG_BOCHS_SHA256SUM:=63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862};
+: ${PKG_BOCHS_VERSION:=2.6.11};
+: ${PKG_BOCHS_URL:=https://fossies.org/linux/misc/bochs-${PKG_BOCHS_VERSION}.tar.gz};
 : ${PKG_BOCHS_CONFIGURE_ARGS_EXTRA:="--disable-docbook --without-x11 --without-wx --without-sdl2 --with-term --with-sdl --enable-idle-hack"};
 : ${PKG_BOCHS_CXXFLAGS_CONFIGURE_EXTRA:="-D_LARGEFILE64_SOURCE -I${PREFIX_NATIVE}/include/ncurses"};
 : ${PKG_BOCHS_INSTALL_FILES:="../obj/.libs/bochs=bin/ ../obj/.libs/bximage=bin/"};
diff --git a/patches/bochs-2.6.11.local.patch b/patches/bochs-2.6.11.local.patch
new file mode 100644
index 00000000..a67d0dc4
--- /dev/null
+++ b/patches/bochs-2.6.11.local.patch
@@ -0,0 +1,62 @@
+diff -ru bochs-2.6.11.orig/cpu/icache.h bochs-2.6.11/cpu/icache.h
+--- bochs-2.6.11.orig/cpu/icache.h      2019-12-09 17:44:36.435957000 +0100
++++ bochs-2.6.11/cpu/icache.h   2021-07-18 13:10:35.350797475 +0200
+@@ -28,7 +28,7 @@
+
+ class bxPageWriteStampTable
+ {
+-  const Bit32u PHY_MEM_PAGES = 1024*1024;
++  #define PHY_MEM_PAGES (1024*1024)
+   Bit32u *fineGranularityMapping;
+
+ public:
+diff -ru bochs-2.6.9.orig/main.cc bochs-2.6.9/main.cc
+--- bochs-2.6.9.orig/main.cc    2017-02-18 17:28:04.318635000 +0100
++++ bochs-2.6.9/main.cc 2021-07-18 01:15:37.859411673 +0200
+@@ -1525,5 +1525,9 @@
+   }
+ #endif
+
++  /* FIXME: this works, but definitely isn't right! */
++  if(signum == 0)
++    return;
++
+   BX_PANIC(("SIGNAL %u caught", signum));
+ }
+diff -ru bochs-2.6.9.orig/configure bochs-2.6.9/configure
+--- bochs-2.6.9.orig/configure  2017-04-09 08:46:13.780213000 +0200
++++ bochs-2.6.9/configure       2021-07-17 23:41:23.537634378 +0200
+@@ -23665,7 +23665,7 @@
+
+   fi
+   case "$target" in
+-    *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*)
++    *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32* | *-midipix*)
+     NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
+     ethernet_modules="$ethernet_modules win32"
+     $as_echo "#define BX_NETMOD_WIN32 1" >>confdefs.h
+@@ -24629,10 +24629,10 @@
+   SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)"
+   # GUI_*FLAGS are added to the compilation of every bochs file, not just
+   # the files in gui/*.cc.
+-  SDL_CFLAGS=`sdl-config --cflags`
++  SDL_CFLAGS=`$PKG_CONFIG --cflags sdl`
+   GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
+   GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
+-  GUI_LINK_OPTS_SDL="`sdl-config --libs`"
++  GUI_LINK_OPTS_SDL=`$PKG_CONFIG --libs sdl`
+   GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
+   # The enhanced X debugger depends on GTK2
+   if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
+diff -ru bochs-2.6.9.orig/gui/term.cc bochs-2.6.9/gui/term.cc
+--- bochs-2.6.9.orig/gui/term.cc	2017-01-15 12:44:43.207284000 +0100
++++ bochs-2.6.9/gui/term.cc	2019-11-04 21:23:25.102021241 +0100
+@@ -29,7 +29,7 @@
+ #if BX_WITH_TERM
+ 
+ extern "C" {
+-#include <curses.h>
++#include <ncurses.h>
+ #include <signal.h>
+ };
+