Received: by mail.netbsd.org (Postfix, from userid 605) id 5E90984CDC; Wed, 3 Jun 2020 13:36:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9D11D84CDC for ; Wed, 3 Jun 2020 13:36:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id VN1UQgkP154j for ; Wed, 3 Jun 2020 13:36:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1DF1C84D69 for ; Wed, 3 Jun 2020 13:36:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 17D19FB27; Wed, 3 Jun 2020 13:36:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1591191387275330" MIME-Version: 1.0 Date: Wed, 3 Jun 2020 13:36:27 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/dosbox-x To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200603133627.17D19FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1591191387275330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Jun 3 13:36:27 UTC 2020 Modified Files: pkgsrc/emulators/dosbox-x: Makefile distinfo pkgsrc/emulators/dosbox-x/patches: patch-configure.ac Log Message: dosbox-x: Update to 0.83.2 0.83.2 - Added help messages for some supported commands. (Wengier) - Added phone book support for the emulated modem. There is a new phonebookfile= option in the [serial] section. The phone book file entries need to be in the format of: " " e.g. 5551234 cavebbs.homeip.net:23 - Implemented the missing EMS subfunctions 52h and 59h by porting the patch that adds them (Wengier) - Fixed issues with the "config -wcd -all" command and other updates to the CONFIG command (Wengier) - Added [config] section in dosbox-x.conf to resemble DOS's CONFIG.SYS file. It currently supports REM, BREAK, NUMLOCK, FCBS, FILES, DOS, DEVICE/DEVICEHIGH, INSTALL/INSTALLHIGH, SET and LASTDRIVE commands. The file CONFIG.SYS will appear on the Z: drive, similar to AUTOEXEC.BAT file. The [config] section can be bypassed with the -noconfig command-line option or with the secure mode enabled (Wengier) - Moved PC-98 related config options (starting with "pc-98 ") from [dosbox] and [dos] sections to its own [pc98] section. These options in existing dosbox-x.conf/dosbox.conf files will be automatically redirected to the [pc98] section from the other sections when DOSBox-X starts (Wengier) - The user directory DOSBox-X uses has been changed to use the DOSBox-X directory (e.g. from ~/.dosbox to ~/.config/dosbox-x on Linux platform). It will be read *after* the dosbox-x.conf file in the current directory (Wengier) - Config option "dpi aware" now supports the "auto" setting to auto-decide on the best setting for the platform. This fixes very small window issue on high DPI devices such as Microsoft Surface tablets. (Wengier) - Added DTASEG, DTAOFF, and PSPSEG as hex value constants to the debugger interface to aid in debugging DOS programs. - New command-line option -helpdebug added to list debug- related command-line options. The standard -? / -h / -help command-line option will no longer list them (Wengier) - Implemented LFN support for FAT driver, so that it is now possible to view directory list, create or open files and directories etc with long filenames on FAT12/16/32 drives just like on mounted local drives. - FAT driver cleaned up and fixed to avoid edge cases that can corrupt directory entries and leave lost clusters on the disk, also fixed to always report root directory as a directory through the GetFileAttribute INT 21h call, needed by MOVE.EXE and XCOPY.EXE to work properly. - IMGMOUNT auto geometry detection will assume LBA disk and fake C/H/S geometry if the disk is 4GB or larger, the MBR lacks executable code, or the first partition is Windows 98-style LBA FAT16 or FAT32. - IMGMOUNT now assumes ISO type by default if the image file extension is .iso/.cue/.bin/.mdf. No need for "-t iso" in this case; but (if appliable) it can be overridden by for example "-t hdd". (Wengier) - IMGMOUNT command (no parameters) now lists mounted FAT/ISO drives and mounted drive numbers, also SUBST command (no parameters) now lists mounted local drives (Wengier) - INT AH=36h fixed to convert free space but maintain a cluster size (bytes/sector * sectors/cluster) that is less than 64KB to avoid divide by 0 crashes with FORMAT.COM /S - Added FAT32 free/total disk space API for FAT driver, and updated INT 21h AX=7303h to call it. FAT driver now provides FAT32 extended disk free/total through FAT32 API and 2GB limited free/total through INT 21h AH=36h for older DOS programs. Shell DIR command updated to use FAT32 free space API to show free space even on FAT32 partitions larger than 2GB, but only if the DOS version is set to 7.1 or higher. - Added FAT32 INT21h and IOCTLs needed by MS-DOS 7.1/Windows 98 versions of SCANDISK.EXE and FORMAT.COM, such as DOS functions for "FAT32 extended" absolute disk read and write. - Improved FAT32 support to the FAT driver, including direct support for FAT32 drives in the DOSBox-X command shell. Files, directories and volume labels on FAT32 drives can be listed, read from or written to just like on FAT12/16 drives. - Added DOS IOCTL read/write logical device track functions so that FORMAT.COM is able to verify and modify the partition table to successfully format a hard drive image. Also added stub to DOS IOCTL "format device track" for FORMAT.COM. - You can now force unmount a drive and then mount it to a new directory in one command, e.g. "MOUNT C C:\DOS -U" (Wengier) - REN command can now rename directories (in addition to files) on FAT drives just like on local drives (Wengier) - Several improvements to DEL command, such as a new /F option to force delete of read-only files, and improved handling when the argument is a directory (Wengier) - LS command added to list directory contents. It does not support all options as in Unix/Linux platform (Wengier) - DIR /O & /OG supported in addition to /ON|/OE|/OS|/OD options. Options such as /-O & /-A can be used to override /O, /A etc if they are specified in the DIRCMD environment varaible (Wengier) - DIR and VOL commands now display real serial numbers for mounted local drives (Windows only) and FAT drives (Wengier) - Fixed SYS command not working properly (Wengier) - DOS kernel INT 21h function Set File Attribute no longer allows changing volume label attributes and fixes directory attributes in order to prevent filesystem corruption. This prevents Windows 95 Setup from creating WINBOOT.INI and then changing it into a directory with the call. - FAT driver bugs fixed where a newly created zero length file combined with a lseek() can corrupt filesytem structures (root directory and/or the second FAT table). This fixes filesystem corruption when running Windows 95 install. - Enabled printer emulation for non-Windows OSes (Linux, Mac OS X, etc.). FreeType2 is required to enable printer emulation at compile time. - Added command-line option "-o" for MOUNT command so that it can be specified whether to report mounted local drives as remote (network) drives. It is "auto" by default just like the virtual drive Z:. - Added config option "drive z is remote" in dosbox-x.conf to report drive Z: as a remote (network) drive. It is "auto" by default, which will try to prevent SCANDISK.EXE from Windows 9x installs to scan and "repair" drive Z: which is not backed by a disk filesystem. - Fixed clip_key_modifier setting not working when it is set to alt, ctrl or shift in the SDL2 build. (Wengier) - Sending "Ctrl+Alt+Del" key from the menu will now reset the system within DOSBox-X when the intergrated DOS or a real DOS booted from a disk image is active. (Wengier) - PC speaker output fixed not to timeout and stop rendering unless the PC speaker output is not emitting anything audible anyway (Fix for Sopwith 1 and 2). - Added ALIAS command to define or display aliases. - "HELP command" now works the same as "command /?" for supported internal commands. (Wengier) - Improved handling of quotes in some commands. (Wengier) - Added -set command-line option to change config options. It can be specified multiple times for multiple options, overriding any options in the config file. For example, the command "dosbox-x.exe -set machine=pc98" will force DOSBox-X to start in PC-98 mode. (Wengier) - Re-added full drive menu items for the Windows platform. The "Boot from drive" item (A:, C: and D: drives only) should work in other platforms too. The BOOT command is also improved to allow e.g. "BOOT A:" to work. (Wengier) - INT 10h vector now points into VGA BIOS as a workaround for DOS programs that use vector location as part of their EGA/VGA detection. This fixes blink attribute and EGA/VGA detection failure with SuperCalc 3 and SuperCalc 4. This option, enabled by default, can be disabled or enabled from dosbox-x.conf. - Improved long filename (LFN) and SetFileAttr/GetFileAttr support for PC-98 mode. (Wengier) - Added config option "lfn" to enable/disable long filename (LFN) support. With default setting of "auto", LFN support is enabled if the reported DOS version is at least 7.0. - Added config option "automountall" (default: false) to automatically mount all available Windows drives (Wengier) - The copy & paste Windows clipboard text via the right mouse button feature now has support for PC-98 mode too in addition to other modes. (Wengier) - MPU401 IRQ fixed to properly default to 2 or 9 in IBM PC/XT/AT mode depending on the "enable slave pic" config option (rderooy) - Fluidsynth defaults fixed for better more reliable audio streaming on Linux and Mac OS X (Wengier and rderooy) - Improved support for FluidSynth MIDI device by porting code from DOSBox ECE. Set "mididevice=fluidsynth" along with other required options such as "fluid.soundfont" in dosbox-x.conf to use it. The previous config setting "mididevice=synth" is still supported for alternative implementation of FluidSynth. (Wengier) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/emulators/dosbox-x/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/dosbox-x/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1591191387275330 Content-Disposition: inline Content-Length: 5978 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/dosbox-x/Makefile diff -u pkgsrc/emulators/dosbox-x/Makefile:1.13 pkgsrc/emulators/dosbox-x/Makefile:1.14 --- pkgsrc/emulators/dosbox-x/Makefile:1.13 Mon May 4 10:22:31 2020 +++ pkgsrc/emulators/dosbox-x/Makefile Wed Jun 3 13:36:26 2020 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2020/05/04 10:22:31 nia Exp $ +# $NetBSD: Makefile,v 1.14 2020/06/03 13:36:26 nia Exp $ -DISTNAME= dosbox-x-0.83.1 +DISTNAME= dosbox-x-0.83.2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/} GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/dosbox-x-${GITHUB_TAG} GNU_CONFIGURE= yes USE_TOOLS+= autoconf autoreconf automake pkg-config -USE_LANGUAGES= c gnu++11 +USE_LANGUAGES= c c++ # C++11 GCC_REQD+= 4.7 Index: pkgsrc/emulators/dosbox-x/distinfo diff -u pkgsrc/emulators/dosbox-x/distinfo:1.8 pkgsrc/emulators/dosbox-x/distinfo:1.9 --- pkgsrc/emulators/dosbox-x/distinfo:1.8 Mon May 4 10:22:31 2020 +++ pkgsrc/emulators/dosbox-x/distinfo Wed Jun 3 13:36:26 2020 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2020/05/04 10:22:31 nia Exp $ +$NetBSD: distinfo,v 1.9 2020/06/03 13:36:26 nia Exp $ -SHA1 (dosbox-x-0.83.1.tar.gz) = c74d74ba4c634077757a165d95288411c1e6d2f8 -RMD160 (dosbox-x-0.83.1.tar.gz) = 617115a4ed42f8c890d95aada58108f8c3cc5512 -SHA512 (dosbox-x-0.83.1.tar.gz) = 43482bbf33ec72f925525ec5fc6cad11f00f5a7dc385b3daaed4ba82f0c7ea372b9de3c83d7189a80a0157023c7e5e54148c1ae2c7ac36b3ff8a34c971e8df9e -Size (dosbox-x-0.83.1.tar.gz) = 37051874 bytes -SHA1 (patch-configure.ac) = 12028b528aa1f4b4d13a25c144954d9f69755e6b +SHA1 (dosbox-x-0.83.2.tar.gz) = 45937131b9470fb57cb1023936a00e0c5cea9dee +RMD160 (dosbox-x-0.83.2.tar.gz) = 027f0fd112e9ef6b25943e107170fbd714469245 +SHA512 (dosbox-x-0.83.2.tar.gz) = ea45de86d66cbe806a3b5c089ebe8307ad541c0f4830605010b2254541650045f87518305037d35da4b12de17bf82086daf67297560eab03d37e046ac63096bd +Size (dosbox-x-0.83.2.tar.gz) = 41708385 bytes +SHA1 (patch-configure.ac) = c2e25ae1532145ea43cb62694e906d17b2d7fc77 SHA1 (patch-include_byteorder.h) = 86eccfbc2318ddc8d71a6de8723947a48d98a126 Index: pkgsrc/emulators/dosbox-x/patches/patch-configure.ac diff -u pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.1 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.2 --- pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.1 Sun Sep 22 09:54:14 2019 +++ pkgsrc/emulators/dosbox-x/patches/patch-configure.ac Wed Jun 3 13:36:26 2020 @@ -1,8 +1,8 @@ -$NetBSD: patch-configure.ac,v 1.1 2019/09/22 09:54:14 nia Exp $ +$NetBSD: patch-configure.ac,v 1.2 2020/06/03 13:36:26 nia Exp $ Fix == test in configure script. ---- configure.ac.orig 2019-06-01 03:37:41.000000000 +0000 +--- configure.ac.orig 2020-06-01 06:00:19.000000000 +0000 +++ configure.ac @@ -171,7 +171,7 @@ CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-O[^ ]* //g'`"] @@ -38,7 +38,7 @@ Fix == test in configure script. CXXFLAGS="$CXXFLAGS -DFORCE_SDLDRAW" AC_DEFINE(C_FORCE_MENU_SDLDRAW,1,[Force SDL drawn menus]) fi -@@ -297,7 +297,7 @@ case "$host" in +@@ -300,7 +300,7 @@ case "$host" in ;; esac @@ -47,7 +47,7 @@ Fix == test in configure script. CXXFLAGS="$CXXFLAGS" else dnl Some default CPU flags -@@ -419,8 +419,8 @@ case "$host" in +@@ -425,8 +425,8 @@ case "$host" in esac fi @@ -58,7 +58,25 @@ Fix == test in configure script. dnl The target cpu checks for dynamic cores AH_TEMPLATE(C_TARGETCPU,[The type of cpu this target has]) -@@ -611,7 +611,7 @@ fi +@@ -594,7 +594,7 @@ AC_CHECK_LIB(fluidsynth, fluid_synth_sys + dnl LIBRARY TEST: FreeType2 + AH_TEMPLATE(C_FREETYPE,[Define to 1 to enable freetype support]) + AC_ARG_ENABLE(freetype,AC_HELP_STRING([--disable-freetype],[Disable freetype support]),enable_freetype=$enableval,enable_freetype=yes) +-AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" == "xyes") ++AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" = "xyes") + if test x$enable_freetype = xyes; then + AC_MSG_CHECKING(for freetype) + pkg-config --exists freetype2; RES=$? +@@ -636,7 +636,7 @@ fi + dnl FEATURE: PRINTER (requires FreeType2) + AH_TEMPLATE(C_PRINTER,[Define to 1 to enable printer emulation]) + AC_ARG_ENABLE(printer,AC_HELP_STRING([--disable-printer],[disable printer emulation]),enable_printer=$enableval,enable_printer=yes) +-AM_CONDITIONAL(C_PRINTER, test "x$enable_printer" == "xyes") ++AM_CONDITIONAL(C_PRINTER, test "x$enable_printer" = "xyes") + if test x$enable_freetype = xyes; then + if test x$enable_printer = xyes; then + AC_DEFINE(C_PRINTER,1) +@@ -646,7 +646,7 @@ fi dnl FEATURE: xBRZ AH_TEMPLATE(C_XBRZ,[Define to 1 to enable XBRZ scaler]) AC_ARG_ENABLE(xbrz,AC_HELP_STRING([--enable-xbrz],[compile with xBRZ scaler (default yes)]),enable_xbrz=$enableval,enable_xbrz=yes) @@ -67,7 +85,7 @@ Fix == test in configure script. if test x$enable_emscripten != xyes; then if test x$enable_xbrz = xyes; then AC_DEFINE(C_XBRZ,1) -@@ -621,7 +621,7 @@ fi +@@ -656,7 +656,7 @@ fi dnl FEATURE: xBRZ AH_TEMPLATE(C_SCALER_FULL_LINE,[Define to 1 to alter the simpler render scalers to operate only on the full scanline instead of detecting differences. This is a performance adjustment for slow or embedded systems]) AC_ARG_ENABLE(scaler-full-line,AC_HELP_STRING([--enable-scaler-full-line],[scaler render full line instead of detecting changes, for slower systems]),enable_scaler_full_line=$enableval,enable_scaler_full_line=no) @@ -76,7 +94,7 @@ Fix == test in configure script. if test x$enable_scaler_full_line = xyes; then AC_DEFINE(C_SCALER_FULL_LINE,1) fi -@@ -663,7 +663,7 @@ else +@@ -698,7 +698,7 @@ else enable_mt32=no AC_MSG_RESULT(no) fi @@ -85,7 +103,7 @@ Fix == test in configure script. dnl NASM (Netwide Assembler) AC_PATH_PROG([NASM], [nasm]) -@@ -993,7 +993,7 @@ else +@@ -1031,7 +1031,7 @@ else AC_MSG_RESULT(no) fi --_----------=_1591191387275330--