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

emulators/dosbox-x: Update to 2022.12.26

This commit is contained in:
Neel Chauhan 2023-01-20 13:39:08 -08:00
parent 63bf401115
commit e8d6842406
7 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/dosbox-x/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= dosbox-x
DISTVERSIONPREFIX= ${PORTNAME}-v
DISTVERSION= 0.84.1
DISTVERSION= 2022.12.26
CATEGORIES= emulators
MAINTAINER= nc@FreeBSD.org

6
emulators/dosbox-x/distinfo
View File

@ -1,3 +1,3 @@
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
TIMESTAMP = 1674249678
SHA256 (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 39fb1ed19ea31e11883aa57655493b3100ac6b328ef59c799b840b9bfdfacb7b
SIZE (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 67886370

11
emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h
View File

@ -1,11 +0,0 @@
--- 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);

12
emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp
View File

@ -1,6 +1,6 @@
--- src/gui/sdl_gui.cpp.orig 2022-07-23 20:37:25 UTC
--- src/gui/sdl_gui.cpp.orig 2022-12-27 02:28:50 UTC
+++ src/gui/sdl_gui.cpp
@@ -3563,6 +3563,7 @@ void GUI_Shortcut(int select) {
@@ -3646,6 +3646,7 @@ void GUI_Shortcut(int select) {
shortcutid=select;
shortcut=true;
sel = select;
@ -8,10 +8,10 @@
#if defined(USE_TTF)
if (ttf.inUse && !confres) {
ttf_switch_off();
@@ -3572,12 +3573,14 @@ void GUI_Shortcut(int select) {
@@ -3655,12 +3656,14 @@ void GUI_Shortcut(int select) {
} else
#endif
RunCfgTool(NULL);
RunCfgTool(0);
+#endif
}
@ -23,9 +23,9 @@
#if defined(USE_TTF)
if (ttf.inUse) {
ttf_switch_off();
@@ -3587,4 +3590,5 @@ void GUI_Run(bool pressed) {
@@ -3670,4 +3673,5 @@ void GUI_Run(bool pressed) {
} else
#endif
RunCfgTool(NULL);
RunCfgTool(0);
+#endif
}

11
emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/gui/sdlmain.cpp.orig 2023-01-20 21:33:36 UTC
+++ src/gui/sdlmain.cpp
@@ -221,7 +221,7 @@ typedef enum PROCESS_DPI_AWARENESS {
extern "C" void sdl1_hax_macosx_highdpi_set_enable(const bool enable);
#endif
-#if !defined(C_SDL2) && !defined(RISCOS)
+#if !defined(C_SDL2) && !defined(RISCOS) && !defined(__FreeBSD__)
# include "SDL_version.h"
# ifndef SDL_DOSBOX_X_SPECIAL
# warning It is STRONGLY RECOMMENDED to compile the DOSBox-X code using the SDL 1.x library provided in this source repository.

12
emulators/dosbox-x/files/patch-src_output_output__surface.cpp
View File

@ -1,12 +0,0 @@
--- 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
}

2
emulators/dosbox-x/pkg-plist
View File

@ -48,11 +48,13 @@ share/bash-completion/completions/dosbox-x
%%DATADIR%%/glshaders/yee64.glsl
%%DATADIR%%/glshaders/yeetron.glsl
%%DATADIR%%/glshaders/zfast_crt.glsl
%%DATADIR%%/languages/de_DE.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/nl_NL.lng
%%DATADIR%%/languages/pt_BR.lng
%%DATADIR%%/languages/tr_TR.lng
%%DATADIR%%/languages/zh_CN.lng