Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
emulators/dosbox-x: Update to 0.84.1
- Loading branch information
1 parent
9da256a
commit a87b171
Showing
6 changed files
with
51 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
6 changes: 3 additions & 3 deletions
6
...les/patch-src_cpu_core_dyn_x86_risc_x86.h → .../patch-src_cpu_core__dyn__x86_risc__x86.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } |
12 changes: 12 additions & 0 deletions
12
emulators/dosbox-x/files/patch-src_output_output__surface.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters