diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index f72bc7ee6f77..e91328bd2b16 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,30 +1,30 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 0.84.0 +DISTVERSION= 0.84.1 CATEGORIES= emulators MAINTAINER= nc@FreeBSD.org COMMENT= DOSBox fork LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png USES= autoreconf iconv sdl GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-core-inline USE_SDL= net sdl sound USE_GITHUB= yes GH_ACCOUNT= joncampbell123 OPTIONS_DEFINE= DOCS OPTIONS_RADIO= DEBUGGER OPTIONS_RADIO_DEBUGGER= DEBUGGER_ENABLE DEBUGGER_HEAVY DEBUGGER_ENABLE_DESC= Enable internal debugger DEBUGGER_HEAVY_DESC= Enable internal debugger with extra features DEBUGGER_ENABLE_CONFIGURE_ON= --enable-debug=yes DEBUGGER_HEAVY_CONFIGURE_ON= --enable-debug=heavy .include diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index a7ef853f7ab5..12c5ae8e5236 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654118426 -SHA256 (joncampbell123-dosbox-x-dosbox-x-v0.84.0_GH0.tar.gz) = 564fbf8f0ab090c8b32bc38637c8204358c386b9cbffcb4f99a81bc82fddbad7 -SIZE (joncampbell123-dosbox-x-dosbox-x-v0.84.0_GH0.tar.gz) = 65495321 +TIMESTAMP = 1658608171 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v0.84.1_GH0.tar.gz) = d5ba5b3d87b0dc69d70f6c9701eec36772bbc3716e0b201b74ec73d4b3ff38cc +SIZE (joncampbell123-dosbox-x-dosbox-x-v0.84.1_GH0.tar.gz) = 67617800 diff --git a/emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h b/emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h similarity index 61% rename from emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h rename to emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h index 2d0948efeb73..97e89e49f431 100644 --- a/emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h +++ b/emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h @@ -1,11 +1,11 @@ ---- src/cpu/core_dyn_x86/risc_x86.h.orig 2014-12-31 12:59:53.015190887 +0000 -+++ src/cpu/core_dyn_x86/risc_x86.h 2014-12-31 13:00:30.953180886 +0000 -@@ -138,7 +138,7 @@ +--- src/cpu/core_dyn_x86/risc_x86.h.orig 2022-07-01 13:24:06 UTC ++++ src/cpu/core_dyn_x86/risc_x86.h +@@ -137,7 +137,7 @@ return_address: "run_return_adress: \n" "popl %%ebp \n" :"=a" (retval), "=c" (tempflags) - :"r" (tempflags),"r" (code) + :"a" (tempflags),"r" (code) :"%edx","%ebx","%edi","%esi","cc","memory" ); reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST); diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp index 75caa4925894..9c5d8ba5efca 100644 --- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -1,33 +1,31 @@ ---- src/gui/sdl_gui.cpp.orig 2022-05-01 06:25:42 UTC +--- src/gui/sdl_gui.cpp.orig 2022-07-23 20:37:25 UTC +++ src/gui/sdl_gui.cpp -@@ -3059,7 +3059,7 @@ class ConfigurationWindow : public GUI::ToplevelWindow - std::string url = "https://dosbox-x.com/"; - #if defined(WIN32) - ShellExecute(NULL, "open", url.c_str(), NULL, NULL, SW_SHOWNORMAL); --#elif defined(LINUX) -+#elif defined(LINUX) || defined(__FreeBSD__) - system(("xdg-open "+url).c_str()); - #elif defined(MACOSX) - system(("open "+url).c_str()); -@@ -3475,7 +3475,11 @@ void GUI_Shortcut(int select) { - PIC_AddEvent(RunCfgTool, 100); +@@ -3563,6 +3563,7 @@ void GUI_Shortcut(int select) { + shortcutid=select; + shortcut=true; + sel = select; ++#ifndef __FreeBSD__ + #if defined(USE_TTF) + if (ttf.inUse && !confres) { + ttf_switch_off(); +@@ -3572,12 +3573,14 @@ void GUI_Shortcut(int select) { } else #endif -+#ifdef __FreeBSD__ -+ RunCfgTool(0); -+#else RunCfgTool(NULL); +#endif } void GUI_Run(bool pressed) { -@@ -3490,5 +3494,9 @@ void GUI_Run(bool pressed) { - PIC_AddEvent(RunCfgTool, 100); + if (pressed || running) return; + + sel = -1; ++#ifndef __FreeBSD__ + #if defined(USE_TTF) + if (ttf.inUse) { + ttf_switch_off(); +@@ -3587,4 +3590,5 @@ void GUI_Run(bool pressed) { } else #endif -+#ifdef __FreeBSD__ -+ RunCfgTool(0); -+#else RunCfgTool(NULL); +#endif } diff --git a/emulators/dosbox-x/files/patch-src_output_output__surface.cpp b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp new file mode 100644 index 000000000000..a6b183a465ed --- /dev/null +++ b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp @@ -0,0 +1,12 @@ +--- src/output/output_surface.cpp.orig 2022-07-23 20:42:49 UTC ++++ src/output/output_surface.cpp +@@ -24,7 +24,9 @@ void OUTPUT_SURFACE_Initialize() + // blitting the wrong dimensions to the window and trigger an X11 BadValue error. + // Set up an error handler that prints the error to STDERR and then returns, + // instead of the default handler which prints an error and exit()s this program. ++#ifndef __FreeBSD__ + X11_ErrorHandlerInstall(); ++#endif + #endif + } + diff --git a/emulators/dosbox-x/pkg-plist b/emulators/dosbox-x/pkg-plist index 2573a48e524a..79e1cdff4fea 100644 --- a/emulators/dosbox-x/pkg-plist +++ b/emulators/dosbox-x/pkg-plist @@ -1,58 +1,63 @@ bin/dosbox-x man/man1/dosbox-x.1.gz share/applications/com.dosbox_x.DOSBox-X.desktop share/bash-completion/completions/dosbox-x %%DATADIR%%/CHANGELOG %%DATADIR%%/FREECG98.BMP +%%DATADIR%%/Nouveau_IBM.ttf +%%DATADIR%%/SarasaGothicFixed.ttf %%DATADIR%%/dosbox-x.reference.conf %%DATADIR%%/dosbox-x.reference.full.conf +%%DATADIR%%/drivez/readme.txt %%DATADIR%%/glshaders/ScanLine.glsl %%DATADIR%%/glshaders/advinterp2x.glsl %%DATADIR%%/glshaders/advinterp3x.glsl %%DATADIR%%/glshaders/advmame2x.glsl %%DATADIR%%/glshaders/advmame3x.glsl %%DATADIR%%/glshaders/crt-aperture.glsl %%DATADIR%%/glshaders/crt-caligari.glsl %%DATADIR%%/glshaders/crt-easymode.glsl %%DATADIR%%/glshaders/crt-easymode.tweaked.glsl %%DATADIR%%/glshaders/crt-geom.glsl %%DATADIR%%/glshaders/crt-geom.tweaked.glsl %%DATADIR%%/glshaders/crt-hyllian.glsl %%DATADIR%%/glshaders/crt-lottes-fast.glsl %%DATADIR%%/glshaders/crt-lottes-fast.subtle+gain.glsl %%DATADIR%%/glshaders/crt-lottes.glsl %%DATADIR%%/glshaders/crt-lottes.tweaked.glsl %%DATADIR%%/glshaders/crt-nes-mini.glsl %%DATADIR%%/glshaders/crt-pi.glsl %%DATADIR%%/glshaders/default.glsl %%DATADIR%%/glshaders/fakelottes.glsl %%DATADIR%%/glshaders/fakelottes.tweaked.glsl %%DATADIR%%/glshaders/none.glsl %%DATADIR%%/glshaders/pixel_perfect-scanlines.glsl %%DATADIR%%/glshaders/pixel_perfect.glsl %%DATADIR%%/glshaders/pixellate.glsl %%DATADIR%%/glshaders/rgb2x.glsl %%DATADIR%%/glshaders/rgb3x.glsl %%DATADIR%%/glshaders/scan2x.glsl %%DATADIR%%/glshaders/scan3x.glsl %%DATADIR%%/glshaders/sharp.glsl %%DATADIR%%/glshaders/tv2x.glsl %%DATADIR%%/glshaders/tv3x.glsl %%DATADIR%%/glshaders/xbr-lv2-3d.glsl %%DATADIR%%/glshaders/xbr-lv2-noblend.glsl %%DATADIR%%/glshaders/xbr-lv2.glsl %%DATADIR%%/glshaders/xbr-lv3.glsl %%DATADIR%%/glshaders/yee64.glsl %%DATADIR%%/glshaders/yeetron.glsl %%DATADIR%%/glshaders/zfast_crt.glsl -%%DATADIR%%/translations/en_US.lng -%%DATADIR%%/translations/es_ES.lng -%%DATADIR%%/translations/fr_FR.lng -%%DATADIR%%/translations/ja_JP.lng -%%DATADIR%%/translations/ko_KR.lng -%%DATADIR%%/translations/pt_BR.lng -%%DATADIR%%/translations/tr_TR.lng -%%DATADIR%%/translations/zh_CN.lng -%%DATADIR%%/translations/zh_TW.lng +%%DATADIR%%/languages/en_US.lng +%%DATADIR%%/languages/es_ES.lng +%%DATADIR%%/languages/fr_FR.lng +%%DATADIR%%/languages/ja_JP.lng +%%DATADIR%%/languages/ko_KR.lng +%%DATADIR%%/languages/pt_BR.lng +%%DATADIR%%/languages/tr_TR.lng +%%DATADIR%%/languages/zh_CN.lng +%%DATADIR%%/languages/zh_TW.lng +%%DATADIR%%/wqy_11pt.bdf +%%DATADIR%%/wqy_12pt.bdf share/icons/hicolor/scalable/apps/dosbox-x.svg share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml