summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-12-03 14:03:19 +0000
committernia <nia@pkgsrc.org>2020-12-03 14:03:19 +0000
commit8311ab4025e2e4db914f62f269ee46d20b67249e (patch)
tree6e3048b6f6f1902914c7bf1d17a761c77128a2ca /emulators
parentcbedac59da79fff3eb4fc45213bdb5a8724cf253 (diff)
downloadpkgsrc-8311ab4025e2e4db914f62f269ee46d20b67249e.tar.gz
dosbox-x: Update to 0.83.8
0.83.8 - Added support for scalable TrueType font (TTF) output for text-mode programs. Set "output=ttf" and optionally a monospaced TTF font (such as consola) with config option "ttf.font" to use it. Lines and columns can be specified with config options "ttf.lins" and "ttf.cols", and the cursor can be made blinking with the option "ttf.blinkc". The config options "ttf.ptsize" and "ttf.winperc" can be used to set the TTF font size and window percentage respectively. If you specify a TTF font size with "ttf.ptsize" then "ttf.winperc" will be ignored. You can also specify a word processor (WP=WordPerfect, WS=WordStar, XY=XyWrite) for the on-screen text-style and 512-character font (WP) features. When using the TTF output DOSBox-X will temporarily switch to a different output when a graphical mode is requested (or when trying to take a screenshot); the TTF output will be auto-switched back later), which can be customized via config option "ttf.outputswitch" (which defaults to auto). Menu items in the "Text-mode" menu group (under "Video" menu) have been expanded to support TTF options such as increasing/decreasing the TTF font sizes and on-screen text style toggling (including bold, italics, underline and strikeout). You can also select a TTF font to use at run-time with the "Select TrueType font (TTF)" menu option. (Wengier) - Added the "Load mapper file..." menu option (under "Main") to select and load a DOSBox-X mapper file at run-time. Be sure to select a SDL1 mapper file for SDL1 builds, and similar for SDL2. (Wengier) - You can now select a host key from the menu (under "Main") including Ctrl+Alt, Ctrl+Shift, Alt+Shift, or use the mapper-defined host key as in previous versions (which default to F11 on Windows and F12 otherwise). A config option "hostkey" is added so that you can specify it from config file. (Wengier) - Pasting text from the clipboard on macOS SDL1 build is now supported like Linux SDL1 build. (Wengier) - Added support for ARM-based Apple M1 MacBook. The dynamic core now works on ARM-based macOS systems. SDL1 builds updated to use newer audio APIs on the macOS platform so that the audio works once again when compiled and run on macOS 11 (Big Sur). Prior to the change, ancient versions of the API dating back to the mid 2000s were used which no longer work on Big Sur. - DOSBox-X will now look for the config file (i.e. dosbox-x.conf/dosbox.conf) and the mapper file in the directory containing the DOSBox-X executable too if the config or mapper file cannot be found in the DOSBox-X working directory. (Wengier) - The system menu in Windows SDL1 builds is now also available for Windows SDL2 builds, and menu items "Reset font size", "Increase TTF font size" and "Decrease TTF font size" are added. (Wengier) - Enhanced the mapper editor interface to allow more keyboard shortcuts to be added, shown in multiple pages in the mapper, navigable with the "Previous Page" and "Next Page" buttons. The text in the grids are now longer and clearer too. The default shortcuts for a few items are changed to use the Host key style (e.g. Host+S and Host+L for saving and loading states respectively). (Wengier) - Added menu item "List network interfaces" under "Help" menu to list network interfaces in the host system for the NE2000 feature. (Wengier) - Added menu group "DOS commands" under "Help" menu to display the help content for the selected DOS shell command (DIR, CD, etc). (Wengier) - Configuration Tool now provides the option to save to the primary or user config files. (Wengier) - Certain config options (e.g. doublescan) that were marked as advanced options are now general config options and will appear in dosbox-x.reference.conf apart from dosbox-x.reference.full.conf. (Wengier) - Added config options "saveremark" (default: true) and "forceloadstate" (default: false) in [dosbox] section which can be used to control if DOSBox-X should ask users to enter remarks when saving a state or show warnings when loading a saved state if there is a mismatch found. (Wengier) - The config option "pixelshader" is moved from the section [gui] to [render] so that it will be in the same section as the option "glshader". (Wengier) - Added menu item "Select OpenGL (GLSL) shader..." to allow OpenGL shader switch from the menu, just like the function for Direct3D pixel shaders. (Wengier) - Added menu item "Show IDE disk or CD status" under "DOS" menu to show the current assignments (disk or CD image) of the IDE controllers. (Wengier) - Fixed IDE CD assignment may not be reset when soft reboots are activated from guest systems. (Wengier) - The program 80x43.COM is added into the ZIP package TEXTUTIL.ZIP on the Z drive. You can also change current text screen to the 80x43 mode from the menu group "Text-mode" under "Video" menu. (Wengier) - Enhanced MODE command so that you can change the number of columns and lines in the screen with the syntax "MODE CON COLS=c LINES=n" (c=80 or 132, and n=25, 43, 50, or 60). The command "MODE CON" will show the current number of columns and lines in the screen as in a real DOS system. (Wengier) - Added FLAGSAVE command for the save state feature to flag (mark) one or more files to be saved and loaded. Type "FLAGSAVE /?" for more information on this command. (PogoMan361 and Wengier) - Enhanced A20GATE command to show the current status of the A20 gate when no parameter is given, along with other small improvements. (Wengier) - INT 21h DOS=HMA emulation, to enable the A20 gate, and autoa20fix, to disable the A20 gate, now checks whether the CPU is running in virtual 8086 mode. If vm86 detected, the code will control the A20 gate by calling the XMS interface instead of direct reading/writing via port 92h. This consideration is required for autoa20fix to cooperate with Microsoft Windows 3.1. Note that Windows 3.1 does not virtualize port 92h. If it did, this workaround would not be necessary. - Added -a option to LOADFIX command which will auto allocate enough memory to fill lowest 64KB memory instead of using exactly 64KB memory. (Wengier) - Added autofixwarning option (true by default) which allows user to silence the messages when DOSBox-X tries to auto-fix "Packed file is corrupt" error when running a program with this issue. (Wengier) - Added autoa20fix option (enabled by default). This option when enabled attempts to resolve EXEPACK "Packed file is corrupt" errors by temporarily disabling the A20 gate and running the program again. This may provide better support for affected DOS applications than the LOADFIX option. If both autoa20fix and autoloadfix are set, then autoa20fix will be tried first, and if it did not work then autoloadfix will be tried next. - The autoloadfix config option changed to allocate only enough memory to keep the executable above the 64KB boundary, instead of blindly allocating 64KB. - Fixed menu items "Rescan drive" and "Swap disk" in "Drive" menu being reversed. (Wengier) - Fixed CD audio issue with the game "The Secret of Monkey Island" when talking to the pirate in Scumm Bar by adapting the patch that fixes it. Thanks kcgen for the fix logic. (Wengier) - Added support for MAME CHD CD images. You can now mount CHD images with IMGMOUNT command, or from the Drive menu. Based on libchdr library and the work of the user whocares010. (Wengier) - Updated FLAC/MP3/WAV CD-DA decoder libraries to the latest versions (versions 0.12.22, 0.6.19, 0.12.14 respectively). Thanks to mackron & kcgen. (Wengier)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/dosbox-x/Makefile5
-rw-r--r--emulators/dosbox-x/distinfo10
-rw-r--r--emulators/dosbox-x/options.mk13
3 files changed, 17 insertions, 11 deletions
diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
index 17a45eeaad3..ee352c24dfa 100644
--- a/emulators/dosbox-x/Makefile
+++ b/emulators/dosbox-x/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2020/11/19 17:19:57 nia Exp $
+# $NetBSD: Makefile,v 1.26 2020/12/03 14:03:19 nia Exp $
-DISTNAME= dosbox-x-0.83.7
-PKGREVISION= 1
+DISTNAME= dosbox-x-0.83.8
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/}
GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV}
diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
index 63b79ef4b82..5d4381611ba 100644
--- a/emulators/dosbox-x/distinfo
+++ b/emulators/dosbox-x/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2020/11/19 17:17:15 nia Exp $
+$NetBSD: distinfo,v 1.15 2020/12/03 14:03:19 nia Exp $
-SHA1 (dosbox-x-0.83.7.tar.gz) = 9ddfa4b40d816593dde04ca3485e80cfe8554bb6
-RMD160 (dosbox-x-0.83.7.tar.gz) = cd4edafe72c77e00166151c1fcc7d2e772d99db7
-SHA512 (dosbox-x-0.83.7.tar.gz) = 2e57bfba9e2373752142be1c61d5f59c88ca04dcf05be6c4052bc850aa413d8c359062eb5a87709b4cdc4142d21f1c0725c987d07ea7d2b67b9a3024d5c9fccb
-Size (dosbox-x-0.83.7.tar.gz) = 47403831 bytes
+SHA1 (dosbox-x-0.83.8.tar.gz) = 25084d9903544ffe954bde2d3ad0d649e8f2eaa0
+RMD160 (dosbox-x-0.83.8.tar.gz) = 067fb76cefde0e30dd049f04c4a2d0baf4fd54bd
+SHA512 (dosbox-x-0.83.8.tar.gz) = 61c75460ac71bb41a654354eb4965dc576c29456db3fd5fa41032e4071f90dce68b4f1b88a314dbb56e9c3850bd6975850d6e20efbdcffc2b14701cfd0127ec0
+Size (dosbox-x-0.83.8.tar.gz) = 47950712 bytes
SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd
SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d
SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681
diff --git a/emulators/dosbox-x/options.mk b/emulators/dosbox-x/options.mk
index 674dbe68717..a705d21895e 100644
--- a/emulators/dosbox-x/options.mk
+++ b/emulators/dosbox-x/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2019/09/22 23:28:55 nia Exp $
+# $NetBSD: options.mk,v 1.2 2020/12/03 14:03:19 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dosbox-x
-PKG_SUPPORTED_OPTIONS= alsa ffmpeg opengl x11
+PKG_SUPPORTED_OPTIONS= alsa ffmpeg freetype opengl x11
PKG_SUGGESTED_OPTIONS.Linux= alsa
-PKG_SUGGESTED_OPTIONS= ffmpeg opengl
+PKG_SUGGESTED_OPTIONS= ffmpeg freetype opengl
.include "../../mk/bsd.fast.prefs.mk"
@@ -27,6 +27,13 @@ CONFIGURE_ARGS+= --enable-avcodec
CONFIGURE_ARGS+= --disable-avcodec
.endif
+.if !empty(PKG_OPTIONS:Mfreetype)
+CONFIGURE_ARGS+= --enable-freetype
+.include "../../graphics/freetype2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-freetype
+.endif
+
.if !empty(PKG_OPTIONS:Mopengl)
CONFIGURE_ARGS+= --enable-opengl
.else