pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/dosbox-x
Module Name: pkgsrc
Committed By: nia
Date: Thu Nov 19 16:52:31 UTC 2020
Modified Files:
pkgsrc/emulators/dosbox-x: Makefile PLIST distinfo
Added Files:
pkgsrc/emulators/dosbox-x/patches: patch-configure
Log Message:
dosbox-x: Update to 0.83.7
0.83.7
- The primary DOSBox-X Wiki is now located at the
URL: https://dosbox-x.com/wiki (Wengier)
- Implemented the x86 dynamic core for both 32-bit
and 64-bit systems by re-porting the code from SVN.
Dynamic core now supports either the dynamic_x86
or the dynamic_rec core. The dynamic_x86 core will
be used by default for x86 and x86_64 platforms and
if "core=dynamic" is set, and Windows 9x can be run
in this dynamic core (although at this time may
encounter some issue with the S3 driver). You can
also explicit specify setting "core=dynamic_x86" or
"core=dynamic_rec" for either the dynamic_x86 core
or the dynamic_rec core. Also thank joncampbell123
for the 64-bit fix. (Wengier)
- You can now use your own save file (in addition to
save slots! There are now a "Use save file" toggle
item and "Browse save file..." for browsing save
files on your computer. A config option "savefile"
(in [dosbox] section) is added to specify a save
file to use at start. (Wengier)
- Save state feature now allows users to optionally
enter remarks when saving a state. A submenu group
"Save/load option" is added (under "Capture") where
you can toggle menu items "No remark when saving
state" (for disabling input of remarks when saving)
and "force load state mode". A menu item "Display
state information" is added as well to display the
information of the saved state. (Wengier)
- DOSBox-X will now use native dialog box to display
quit warnings and save state errors. (Wengier)
- Changed some DOS error messages (such as "Illegal
command" which now reads "Bad command or filename")
similar to real DOS systems. (Wengier)
- ADDKEY and INT2FDBG commands now appear as programs
on Z: drive instead of shell commands. (Wengier)
- Improved the -z (move virtual drive Z:) function of
MOUNT command. You can move the virtual drive as
many times as you want, and save/load states will
work even after you move the Z: drive. (Wengier)
- Enhanced the config option "freesizecap" to allow
the setting "fixed" which is the same as "false",
and a new setting "relative" is added, which will
be similar to the setting "fixed" but the reported
free disk size will also change relative to the
change of the free disk size ever since. (Wengier)
- Added support for Opus CD-DA tracks by porting and
cleaning up the source code from other projects.
Many thanks to Marty Shepard and kcgen. (Wengier)
- Support for FluidSynth MIDI Synthesizer is now
included in the MinGW builds by default just like
Visual Studio builds. Set "mididevice=fluidsynth"
and a soundfont file to use it. (Wengier)
- Enabled xBRZ scaler for Visual Studio SDL2 builds
just like Visual Studio SDL1 builds. (Wengier)
- Added menu item "Show Sound Blaster configuration"
under "Sound" menu to show the current information
about Sound Blaster, and also menu item "Show MIDI
device configuration" (also under "Sound" menu)
to show information about the current MIDI device
such as the soundfont file in use. (Wengier)
- Added "Mount multiple disk/CD images" option to the
mounting options of the Drive menu to allow users
to mount more than one disk/CD images to a drive,
swappable from the menu. Also added separators to
the Drive submenu to make it look better. (Wengier)
- Added new CPU types to the "Emulate CPU speed" menu
group namely 286-25MHz, 386DX-25MHz, 486DX4-100MHz,
486DX5-133MHz, Pentium-60MHz, Pentium-75MHz, and
Pentium-90MHz. Thanks again for the data provided
by the user maximus105. (Wengier)
- You can now select a special key (e.g. Alt+Tab,
Ctrl+Break, Ctrl+Alt+Del, etc) to be sent from the
key defined in the mapper editor. The key can be
selected (Ctrl+Alt+Del by default) from the "Send
special key" menu group in "Main" menu. (Wengier)
- Added full Ctrl+Break emulation at the BIOS and
DOS level, updated console emulation to match.
The "Pause" mapper shortcut is now moved to
HOST[F11/F12]+Pause instead of Ctrl+Pause so that
Ctrl+Break can work properly for users, and the
function to send the Ctrl+Break key from the menu
("Send special key" under "Main") is added. Also,
the PC-98 STOP key now functions the same as the
Ctrl+C and Ctrl+Break keys in IBM PC mode.
- Added functions "CopyToClipboard" and "QuickRun" to
the mapper editor so that you can use shortcuts to
activate them (default shortcuts: HOST(F11/F12)+A
and HOST(F11/F12)+Q respectively), and a default
shortcut HOST(F11/F12)+V is added to the clipboard
paste function. Meanwhile, FullCore and SimpleCore
shortcuts are removed from the mapper. (Wengier)
- Added two new menu items in the "Shared clipboard
functions" menu group under "Main", including "Copy
all text on the DOS screen" which will copy all
screen text to the clipboard, and "Stop clipboard
pasting" which allows user to stop pasting in the
middle of pasting long clipboard content. (Wengier)
- The mouse copy/paste feature is now available for
non-Windows systems on SDL2 builds. Also, pasting
from the clipboard with a mapped shortcut is also
available for Linux/X11 on SDL1 builds. (Wengier)
- Added "Use US keyboard layout" toggle menu item in
the "PC-98" menu group under "Video" to select
whether to force the default US keyboard layout in
PC-98 mode, same as the "pc-98 force ibm keyboard
layout" config option in [pc98] section. Also moved
the "PC-98 PIT master clock" options from the "DOS"
menu to this menu group. (Wengier)
- The full dosbox-x.reference.conf file is renamed to
dosbox-x.reference.full.conf. The original file
dosbox-x.reference.conf now contains common config
options instead of all config options. (Wengier)
- The CONFIG command and Configuration Tool will now
save common and modified config options by default.
The -all command-line option (or "Save all options
to the configuration file" checkbox) will force to
save all config options. A new -mod command-line
option is added to CONFIG command to save modified
config options only, and a new -norem command-line
option is added to not write remarks. (Wengier)
- Updated the Windows installer to default to the
"typical" installation. For the full installation
start menu items will be added for DOSBox-X builds
copied to subdirectories. A new checkbox "Write
common config options (instead of all) to the
configuration file" is added which when checked
will only write common and modified advanced config
options to the config file. Furthermore, for both
"typical" and "full" installations the Windows
installer will now also copies the DLL files
inpout32.dll (32-bit) and inpoutx64.dll (64-bit) to
the DOSBox-X install directory for use with the
direct parallel port passthrough feature. (Wengier)
- Improved Flatpak support for Linux. (rderooy)
- Improved message for the -help command-line option,
adding for example -silent and -socket command-line
options in the help messages. (Wengier)
- Added -silent command-line option to run DOSBox-X
silently (without showing the DOSBox-X window) and
then exit after executing AUTOEXEC.BAT. (Wengier)
- Fixed command-line option -socket not working for
the null-modem feature. (Wengier)
- Fixed issue that aspect ratio not being respected
in full-screen mode when a GLSL shader is enabled
with an OpenGL output. (Wengier)
- Fixed toggle in the "Frameskip" menu group did not
change when selecting a different option. (Wengier)
- Fixed shelling from programs may not work when the
shell config option is set. (Wengier)
- The default country setting ("country" option in
[config] section]) now defaults to auto-detection
if possible, or 81 (Japan) in PC-98 mode. (Wengier)
- Increased the default maximum DOS files (adjustable
from [config] section) from 127 to 200. (Wengier)
- Improved resetting with LOADLIN program. (Wengier)
- Improved Gravis Ultrasound (GUS) implementation to
make it more accurately represent the GUS DMA state
as expected by the running DOS software.
- The archive attribute will no longer automatically
be applied to directories on non-Windows systems.
This fixed issue with PLAYMIDI.EXE from Gravis
Ultrasound when listing directories. (Wengier)
- Applied hack to allow the low DMA channel detection
in the SB16 DIAGNOSE program to work. (Wengier)
- The default setting of the clip_paste_speed option
has been changed from 20 to 30, which will help
prevent lost keystrokes when pasting from the host
clipboard for some programs. (Wengier)
- With Pentium CPU setting (cputype=pentium) DOSBox-X
no longer reports FDIV bug by default. An advanced
config option "report fdiv bug" is added to report
such CPU bug when set to true. (rderooy & Wengier)
- Added support for the XDG_DATA_HOME environment
variable for config directory in Linux. (rderooy)
- Added support for compiling with pcap for Windows
MinGW builds. (Jookia)
- Added config option "windowposition" (in [sdl]
section) to set the window position at startup in
the positionX,positionY format. (tomba4)
- Added config option "raw_mouse_input" (in [sdl]
section; SDL2 builds only) to bypass the operating
system's mouse acceleration & sensitivity settings.
Implemented by NicknineTheEagle.
- Added config option "startquiet" (in [dos] section)
which when set to true will silence the information
messages before launching Windows programs to run
on the Windows host. A toggle menu item "Quiet mode
(no start messages)" is added to the "Windows host
applications" menu group in "DOS" menu. (Wengier)
- The menu "Show details" (under "Main") is renamed
to "Show FPS and RT speed in title bar". (Wengier)
- Add menu group "Text-mode" under "Video" menu to
change some text-mode related video settings, such
as changing the number of rows and columns. A zip
package named TEXTUTIL.ZIP is added to the Z drive
that contains various utilities (such as CGA.COM,
EGA.COM, 132X25.COM, 132X43.COM) to change current
video setting from the command line. Also added a
config option "high intensity blinking" which when
set will display high intensity background colors
instad of blinking foreground text. The menu item
"Allow 9-pixel wide fonts" is moved from the menu
group "Compatibility" to here. (Wengier)
- Added "Debugging" menu group under "Help" menu, and
moved items from the "Video" Debug and "DOS" Debug
menus and the debugger here (debug builds only).
Also allowed to hide/show the console or debugger
window in Windows debug builds. With the menu item
"Console wait on error" checked the Windows console
window will wait for the ENTER key before closing
itself after an E_EXIT occurs. (Wengier)
- Updated MPXPLAY to latest version 1.65. (Wengier)
- Integrated SVN commits (Allofich)
- r4386: Correct MPU-401 clock-to-host function to
operate independently of playing. Fixes hang at
exit when playing Roland music in demos by The
Phoney Coders. Clamp tempo to valid range.
- r4384: ICW1 on the PIC clears the Interrupt Mask
Register. Fixes Antagony and quite a few demos that
expect IRQs to be unmasked.
- r4382: Refine adlib timers a bit more and make
reading the Adlib take a bit more time.
- r4378: Prevent some possible deadlocks with sti
in dynrec core.
- r4375: Improve compatibility with older Intel
chipsets
- r4374: Add a bit of hack so cycles=max/auto 90%
keeps on working inside batch files after r3925.
- r4371: Fix regression in Clue: Master Detective.
- r4370: As an adjunct to r4369, make the reference
counts of standard device handles equivalent to
those of real DOS.
- r4369: Compatible side-effect behavior of DOS in
the file close function.
- r4368: Improve error codes for some DOS file functions.
- r4367: Change FPU_FBST to only write 18 decimals
instead of the wrongly 19, this makes it possible
to switch 64 integers which in turn fixes some
rounding issues. (jmarsh)
- r4282,r4283: Switch to a different way to calculate
DBOPL table offsets.
- r4280: Prevent GenerateDMASound from running with
input of 0.
- r4279: Remove DMA_TRANSFEREND and replace with
DMA_MASKED.
- r4277: Remove cases not needed after r4276
- r4276: Remove defunct code related to the initial
display mode of the system BIOS during video mode
changes.
- r4274: fix externals.
- r4273: Make frameskip an integer.
- r4269: Use fabsf when return value is a float.
Small warning fix.
- r4265: Some more cleanups and memleak fixes.
- r4264: Pick some lowhanging fruit. (some memory
leaks and unused variables)
- r4262: missed one
- r4261: These actually use float as input.
- r4258: Rename bios tester to biostest and make it
debug only to avoid people trying to load real
bioses.
- r4257: Add simple program that allows you to boot
into a bios image for running cpu tester bios.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/dosbox-x/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/dosbox-x/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/dosbox-x/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/dosbox-x/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/emulators/dosbox-x/Makefile
diff -u pkgsrc/emulators/dosbox-x/Makefile:1.22 pkgsrc/emulators/dosbox-x/Makefile:1.23
--- pkgsrc/emulators/dosbox-x/Makefile:1.22 Fri Oct 9 07:40:44 2020
+++ pkgsrc/emulators/dosbox-x/Makefile Thu Nov 19 16:52:31 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/10/09 07:40:44 nia Exp $
+# $NetBSD: Makefile,v 1.23 2020/11/19 16:52:31 nia Exp $
-DISTNAME= dosbox-x-0.83.6
+DISTNAME= dosbox-x-0.83.7
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/}
GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV}
@@ -26,11 +26,17 @@ CONFIGURE_ARGS+= --disable-sdltest
CONFIGURE_ARGS+= --disable-sdl
CONFIGURE_ARGS+= --enable-sdl2
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
-CONFIGURE_ARGS+= --disable-dynrec
-CONFIGURE_ARGS+= --disable-unaligned-memory
-.else
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm
+.endif
+
+.if ${MACHINE_ARCH} != "i386" && \
+ ${MACHINE_ARCH} != "x86_64" && \
+ ${MACHINE_ARCH} != "aarch64" && \
+ ${MACHINE_ARCH} != "earmv6hf" && \
+ ${MACHINE_ARCH} != "earmv7hf"
+CONFIGURE_ARGS+= --disable-dynamic-core
+.else
# LOG: Setting execute permission on the code cache has failed
NOT_PAX_MPROTECT_SAFE+= bin/dosbox-x
.endif
@@ -60,7 +66,7 @@ do-install:
${DESTDIR}${PREFIX}/share/dosbox-x
${INSTALL_DATA} ${WRKSRC}/contrib/icons/dosbox-x.png \
${DESTDIR}${PREFIX}/share/pixmaps/dosbox-x.png
- ${INSTALL_DATA} ${WRKSRC}/contrib/linux/dosbox-x.desktop \
+ ${INSTALL_DATA} ${WRKSRC}/contrib/linux/com.dosbox_x.DOSBox-X.desktop \
${DESTDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/CHANGELOG \
${DESTDIR}${PREFIX}/share/dosbox-x
Index: pkgsrc/emulators/dosbox-x/PLIST
diff -u pkgsrc/emulators/dosbox-x/PLIST:1.3 pkgsrc/emulators/dosbox-x/PLIST:1.4
--- pkgsrc/emulators/dosbox-x/PLIST:1.3 Fri Oct 9 07:31:44 2020
+++ pkgsrc/emulators/dosbox-x/PLIST Thu Nov 19 16:52:31 2020
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2020/10/09 07:31:44 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/11/19 16:52:31 nia Exp $
bin/dosbox-x
-share/applications/dosbox-x.desktop
+share/applications/com.dosbox_x.DOSBox-X.desktop
share/dosbox-x/CHANGELOG
share/dosbox-x/FREECG98.BMP
share/dosbox-x/dosbox-x.reference.conf
Index: pkgsrc/emulators/dosbox-x/distinfo
diff -u pkgsrc/emulators/dosbox-x/distinfo:1.12 pkgsrc/emulators/dosbox-x/distinfo:1.13
--- pkgsrc/emulators/dosbox-x/distinfo:1.12 Fri Oct 9 07:31:44 2020
+++ pkgsrc/emulators/dosbox-x/distinfo Thu Nov 19 16:52:31 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2020/10/09 07:31:44 nia Exp $
+$NetBSD: distinfo,v 1.13 2020/11/19 16:52:31 nia Exp $
-SHA1 (dosbox-x-0.83.6.tar.gz) = bcfb44fe746a225bc464a8c7954522062bd9f8cd
-RMD160 (dosbox-x-0.83.6.tar.gz) = fc12912084e0ba152febebe3541f6879f9b3980f
-SHA512 (dosbox-x-0.83.6.tar.gz) = 6881d7e279d83e732497661bfad9cf64a1475d801416713178d4e48adfff7e3c4d3f84e78764704ff8b0bc76bc4935f0242051f0fd9a1a08261ab0111413e681
-Size (dosbox-x-0.83.6.tar.gz) = 46151537 bytes
+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 (patch-configure) = 6a4be02b1b7581dbb9656673a32a92c01cd89c83
SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681
Added files:
Index: pkgsrc/emulators/dosbox-x/patches/patch-configure
diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-configure:1.1
--- /dev/null Thu Nov 19 16:52:31 2020
+++ pkgsrc/emulators/dosbox-x/patches/patch-configure Thu Nov 19 16:52:31 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2020/11/19 16:52:31 nia Exp $
+
+Detect NetBSD/evbarm properly.
+
+--- configure.orig 2020-11-19 11:29:25.115543480 +0000
++++ configure
+@@ -7678,7 +7678,7 @@ $as_echo "Motorola 68000" >&6; }
+ c_targetcpu="m68k"
+ c_unalignedmemory=yes
+ ;;
+- armv7l)
++ armv7*)
+ $as_echo "#define C_TARGETCPU ARMV7LE" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv7 Little Endian" >&5
+@@ -7686,7 +7686,7 @@ $as_echo "ARMv7 Little Endian" >&6; }
+ c_targetcpu="arm"
+ c_unalignedmemory=yes
+ ;;
+- armv6l)
++ armv6*)
+ $as_echo "#define C_TARGETCPU ARMV4LE" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv6 Little Endian" >&5
Home |
Main Index |
Thread Index |
Old Index