emulators/dosbox-x: Update to 2022.12.26

freebsd · Jan 20, 2023 · e8d6842 · e8d6842
1 parent 63bf401
commit e8d6842
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 33 deletions.
diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dosbox-x
 DISTVERSIONPREFIX=	${PORTNAME}-v
-DISTVERSION=	0.84.1
+DISTVERSION=	2022.12.26
 CATEGORIES=	emulators
 
 MAINTAINER=	nc@FreeBSD.org

diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
@@ -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
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
diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp
@@ -1,17 +1,17 @@
---- 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;
 +#ifndef __FreeBSD__
  #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
  }
diff --git a/emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp b/emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp
@@ -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.
diff --git a/emulators/dosbox-x/files/patch-src_output_output__surface.cpp b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp
diff --git a/emulators/dosbox-x/pkg-plist b/emulators/dosbox-x/pkg-plist
@@ -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