pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
dosbox-x: update to dosbox-x-0.82.19
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Sat Jun 1 20:34:52 2019 +0200
Changeset: 9aa656940597a0191b581f116de268fdaa893dc6
Modified Files:
dosbox-x/Makefile
dosbox-x/distinfo
dosbox-x/patches/patch-configure.ac
Log Message:
dosbox-x: update to dosbox-x-0.82.19
Changelog:
0.82.19
- Prefetch core fixed up, made more aggressive, and string
instructions (REP MOVSW) cause more prefetch. "Stereotype"
demoscene production can run again.
- DOSBox Integration device now allows ISA DMA read/write
injection.
- 8237 DMA emulation now supports PC-98 "auto bank increment"
functions, which automatically increments the DMA page number
on DMA wraparound. Sim City 2000 needs this to play it's
digitized sound effects properly.
- 8237 DMA emulation now enforces read/write mode provided by
guest. If the DMA is configured for reading from system
memory, then attempts to WRITE to memory via DMA must fail.
Just like real hardware.
- 8237 DMA block transfer cleanup, de-duplication.
- 8237 DMA block cleanup allows implementation of 8/16-bit DMA,
forwards and backwards.
- PC-98 keyboard corrections (not yet verified to be accurate
to hardware though) to solve problems where holding a key
while running a program that is slow to respond to input
can overrun the buffer and fail to handle additional input.
- VGA BIOS size changed to 0x4000 (16KB), because 0x3800
is not liked by Windows 3.0.
- Font vector is now INT 44h for PCjr and Tandy emulation,
INT 43h otherwise as documented in the RBIL.
- Graph key (PC-98 mode) no longer registers as keyboard
input to INT 18h. EDIT.COM's menu is now usable.
- PC-98 INT 18h AH=02h fixed to return the correct keyboard
status byte as documented
- Local directory filesystem support now applies timestamp
before closing the file handle, which should help with
timestamps even if the filename is not directly valid
on the host operating system or filesystem.
- DOSBox Integration Device moved to I/O port DB28h-DB2Bh
in PC-98 mode to avoid conflicts with DMA controller
registers.
- DMA controller is now completely disabled in IBM PCjr mode
(machine=pcjr) to match real hardware.
- COPY command now copies file date/time as well.
- INT 2Fh AX=1600h no longer logs an error as unimplemented.
(Allofich)
- COPY.EXE removed, so that the built-in COPY command can work.
- PC98UTIL fixed to re-enable the text layer after the BIOS call
for /24khz and /31khz options.
- PC-98 INT 18h AH=30h now allows setting the 480-line mode.
- (PC-98) Port 6Ah command 40h/41h, CRT vs Plasma/LCD mode,
added.
- PC98UTIL.COM now updates the menu item for PC-98 GDC clock
speed when changing GDC clock speed.
- Added to PC98UTIL.COM the /24khz and /31khz switches to change
hsync rate.
- Updated PC-98 graphics plane emulation to more properly
handle the 5MHz GDC mode, and the IM bit in the GDC parameter
RAM.
- INT 18h AH=30h and AH=42h mode set fixed to update CPU and
display pages correctly.
- INT 18h AH=30h (PC-98 mode) now permits graphics layer changes.
- INT 18h AH=30h (PC-98 mode) now permits changing hsync rate.
- INT 18h AH=31h (PC-98 mode) now uses BIOS data area to
return hsync rate (24KHz vs 31KHz)
- INT 18h AH=42h (PC-98 mode) now uses BIOS data area to
determine 5MHz GDC instead of internal state to better emulate
actual hardware behavior.
- PC-98 text console output now fills both cells of doublewide
characters on the text layer.
- PC-98 port 6Ah now handles command 82h/83h and 84h/85h which
allow the guest to reprogram the GDC clock frequency (2.5MHz
or 5MHz). This is necessary to handle strange Windows 3.1
behavior where entering a DOS program fullscreen causes
Windows 3.1 to reprogram your GDC to run at 5MHz regardless of
the BIOS (or dosbox.conf) setting.
- PC-98 port 68h now supports command 0Eh/0Fh to enable display.
- Integrated commits from mainline (Allofich)
- Lower the influence of the aspect table correction
trick when using high scale factors (320x200 => 2000x1200).
- Correction done to Hercules video height parameter.
- The mapper now uses the wrapper as well
- Fix the possible/suggested values for integer
properties.
- Do less to update the frequency of an active SB
DMA transfer. Fixes sound in Tempest 2000.
- Add missing --disable-fpu-x64 option
- Use clock_gettime when available instead of the
obsolete ftime.
- Allow CRTC read/write access on all mirror ports for
non-VGA machine types. Fixes Tandy and EGA display in
International Hockey booter.
- Handle "copy H*.txt file.txt" correctly
- Fix detection of always_inline attribute with MinGW 4.9.2
- Introduce mount -pr to mount paths relative to last
loaded configuration file.
- Use normal teletype function for non-ANSI output so the
default attribute 7 applies only to graphics modes and
existing attributes are not changed in text modes.
- Improve compatibility of internal mouse driver with
respect to video mode changes and hiding the pointer, and
handle font reloading as a kind of mode change. Also fix
unlocked mouse pointer to recognize the full range of
tweaked/fontloaded text modes.
- Bring OS2 port up to date.
- Ignore/remove single % in batchfiles.
(Fixes B13Demo batchfiles on PC Gamer cover disc 1995-08)
- Clear incomplete Sound Blaster DSP command at reset,
fixes Romancing Prince.
- Add some more cases to the Alt-Tab detection.
- Add alternate font tables and associated loading logic
in video BIOS, allowing correct gaps between "wide"
characters (e.g. m,w,M,W,T,Z,0) in all VGA machine types.
- Update all related BIOS memory values and CRTC registers
when loading fonts.
- Improve support for MDA emulation in the vgaonly machine
type, as it is the only way the video BIOS can make use
of the 14-line alternate symbols.
- Be compatible by setting the INT 43h vector to the first
half of the 8-line font table for standard text modes.
- Move VESA mode table and OEM string before font tables
in the video ROM, which is a more compatible ordering.
- Add opl3gold option to oplmode setting. With this option
the Adlib Gold music can be selected in Dune. Only music
without effects is supported. FM volume control does work.
- Add hardware text mode cursor support.
- Rework FCB_ParseName
-- Remove special code for . and .. as it was wrong
-- Continue reading the input string, when the max length
of the field has been reached (123456789.12345 is read and
returned as 12345678.123)
-- Strip spaces before and after reading the separators.
-- The drive is always parsed (if present), it doesn't
depend on the existence of said drive.
-- Fix parsing of .EXE and other extension only names
-- Always clear out current block and record size.
- Correct AX and BX, they contain information on the
existence of the drives specified in the FCBs in the
execute block
- Rework the parsing of arguments into the FCBs
- Use full mask; fixes label search on FAT drives.
- Don't write past the terminator in the DTA name field
when setting search results. This is what DOS does, and
writing junk after the terminator was not good in any case.
Fixes file listing in the 16-bit version of Galaxy Player.
- Improve rename support for when renaming files (in a
folder) on a drive different from the current one.
- Improve internal ANSI support to adapt to currently
displayed columns and rows. Fixes original Infocom
interpreters when using something other than 80x25.
- Handle double-quoted values and quoted values in
dosbox.conf files.
- Speed up GetHexValue.
- Restore 1,2,3,4,5 as run 5,500,1000,5000,10000
instructions.
- Change BIOS equipment list to indicate DMA not
supported on PCjr machine type, which fixes PCjr
detection in old versions of Ancient Art of War.
- Correct some offsets in the DTA for FCB-based search
results. Fixes DIR listing in COMMAND.COM from MS-DOS
and file info in XTree Gold.
- Prevent a multiplication overflow and more accuracy
by using floats for attack rate loop
- Set record size to 128 if it is 0 in the FCB when
calling any FCB read/write function
- Fixes for acad 10:
- Add missing reference counting when the file is
already open when calling FCB_Open, so that acad, which
uses FCBs and normal handles on the same file, works
better.
- Remove FCBs being added to the PSP filetable and
rewrite most functions to support this change. This way
acad won't run out of temporary (fcb) files when low on
memory.
- More flexible setting of version with "VER" command.
- Fix screen clearing when setting mode 0xA on PCjr
machine type.
- Fill DTA for FCB search results more like real DOS,
fixing hang in SETUP.EXE and MSDOSD.EXE from Windows V1.01.
- Add support for mode 8 row copy/fill. Fixes Tandy
GW-BASIC interpreter SCREEN 3 scrolling/clearing.
- Map inactive video memory regions as empty rather than
filled with RAM. Fixes later version of Sargon 3 on color
machine types.
Set color modes (to the extent that they can be) on the
Hercules machine type if the BIOS equipment list is not set
to monochrome. Fixes missing text in Victory Road.
- Graphics mode text drawing improvements:
-Font source according to machine type.
-Use compatible method of determining fill attribute for
textmode screen scrolling in teletype function.
- Prevent DOS buffered input function from hanging in an
infinite loop when redirected input reads a linefeed or
reaches EOF.
- EXEC improvements, mostly for the load-but-do-not-execute
function.
- Stop writing uninitialized junk into first shell's command
tail at startup.
- Support writing palette register data to dynamic save area
if pointer is non-zero on mode changes. Fixes CV 2.2.
- Be more compatible by converting tabs to spaces in the DOS
console device rather than in the video BIOS teletype function.
- Make the internal program for loading ROM images a bit
smarter about what it can/will load. Also provide for BASIC
in ROM to support IBM BASIC interpreters.
- Correct page count/size for CGA graphics modes. Fixes RS-2
on the CGA machine type.
- Raise lower limit of cycles in autodetermine mode to
improve stability.
- Fix for 256 color encoding in zmbv.dll codec
- Rework ListMidi so it can be more easily added to more
backends.
- Implement mixer /listmidi for coremidi.
- Increase size of SysEx buffer to support Sierra's Yamaha
FB-01 driver.
- Add improved breakpoint handling to the debugger
- Rewrite the order of the debug help list so the keys come
last
- Clip to boundaries when there are no suggeted values for
Prop_int
- Implement an obscure behavior of the VGA DAC. Fixes wrong
colors in Planet Soccer/Football.
- Use default attribute behavior of ANSI.SYS in the console
device. Fixes scrolling issues. Anything that wants non-ANSI
behavior may not display as intended with the internal DOS,
same as real DOS when ANSI.SYS is loaded.
- Lower default adlib volume with 2.5dB, based on
measurements
- Add experimental name support to configmidi for coremidi
- Add support for selectig midi devices by name to win32
midi
- Make IRQ generation in Write_MCR consistent with
ComputeInterrupts when op2 changes.
- Update mixer volume calculations for the SBPRO 1 and 2 and
the SB16, based on measurements.
- Repair a logic error in cycle max calculation
- Introduce a random sleep period, which activates after 3
short sleeps in one frame.
- Adjustments to cycle ratio computation.
- Process repeated reset commands without delay. Fixes MPU
detection in several games. Correct ACK for reset: entirely
absent with dumb setting (mpu401=uart), and also absent when
returning to intelligent mode from UART mode.
- Allow for direct changing of 4op chaining without having
to rewrite the algorithm mode.
- Enable core inlining by default on configure/make build
system
- Limit amount of polls per second a bit on MAC OS X, as it
was quite high otherwise.
- Add basic support for INT 13 call 15. Used by Korean
Powerdolls to detect harddrive.
- Add ALSA MIDI 0xA0 and improve unhandled message
reporting a bit.
- Support rarely used FCB feature: open file with search
mask. Fixes Buckaroo Banzai.
- ANSI emulation is activated for the session when an
escape sequence is encountered other than those used by
internal messages. Fixes LucasArts setup programs provided
that ANSI emulation is not activated.
- Flag handling for normal core: zero and sign flags for
integer multiply instructions.
- Strip spaces properly.
- Improve disk serial number DOS functions.
- Only add return to buffer if it already contains data,
which fixes extra return in generated autoexec.bat.
- Lock default label of HDD local drive mounts. Fixeslabel
changing to the host drive label when resetting cache on
the Windows platform.
- Fix echo off being written twice. Attempt to make the
line endings in the generated autoexec.bat all DOS-style.
- Take length in consideration before moving the echo off
upwards.
- Fix ExpandDot not caring about the size of the buffer.
(vogons topic 59658)
- Be less specific about the jump instruction when
identifying a video BIOS.
- Return an error for generic block device request on
unmounted floppy drives.
- No Sound Blaster IRQ generating when masking the IRQ
channel.
- Improvements for IOCTL generic block device request
- Make Media ID table relative to DPB table. Fixes
Hattrick by Ikarion.
- Support some installer disk detection methods: block
device count, and specific MBR/boot sector contents.
Fixes (original) SimCity, Amberstar, and later MicroProse
installers.
- Fix GetLabel() for the virtual drive.
- Integrated a commit from mainline:
#3860 "Use PCJr specific method to clear the video RAM.
Also don't scroll at unspecified video page.
Fixes issues with KQ1 and KQ2."
- PEGC emulation will now print a warning if the guest
application or OS attempts to use 256-color planar mode.
- PC-98 PEGC 256-color linear framebuffer is not mapped by
default anymore, except when 256-color mode and the enable
bit set, to match real hardware.
- PC-98 PEGC 256-color emulation fixed not to respond to
MMIO registers related to 256-color planar mode according
to real hardware behavior. 256-color planar mode support
is planned in the future.
- Remove old dynamic x86 core. Dynamic core is exclusively
dynrec now.
0.82.18
- Added debugger command "VGA CRTC" for the CRTC section of
VGA emulation.
- Added debugger command "VGA DAC" for the DAC and "VGA DACPAL"
command to view the VGA color palette.
- Added debugger command "VGA GC" for the graphics controller
section of VGA emulation.
- Added debugger command "VGA SEQ" for the sequencer section
of VGA emulation.
- Added debugger commands "VGA DRAW" and "VGA AC" to view
drawing and attribute controller state in the VGA emulation.
- Integrated commits from mainline (Allofich)
- CD audio status now returns zero start and end times
when no track is playing. Fixes "The Manhole".
- Add "ADDLOG" debug command to manually add a message
to the log.
- "Strip off leading zeroes from the IP", a fix for
the serial modem.
- Add a small delay when raising the Sound Blaster
8-bit IRQ to emulate the slowness of the DSP, fixes
Llamatron 2012 and Lemmings 3D.
- Add ability to set debugger breakpoint on AL values.
- The SB DMA callback now ignores previously selected,
but not currently selected, DMA channels. Fixes Visual
Player 2 with SB16.
- Minor cleanup to joystick code.
- PSG noise channel emulation (PC-98 FM board) apparently
broke on Mac OS X due to type promotion by Clang/LLVM.
Modified the code to behave as originally intended, to
restore the PSG noise channel on Mac OS X.
- Added debugger command "DOS FNKEY" to view PC-98 scan code
escape mapping.
- PC-98 EGC ROP 9Ch added, apparently used by Windows 3.1
CALC.EXE
- PC-98 INT DCh CL=0Ch/CL=0Dh AX=01h through AX=28h added,
which allows individual function/edit keys to be read or
modified.
- Dynrec dynamic core is now default even on 32-bit builds.
Dynx86 dynamic core is still an option at this time if you
compile from source.
- PC-98 INT DCh CL=0Fh AX=0h/1h added.
- PC-98 INT DCh CL=0Ch/CL=0Dh added AX=0 handling as well.
- PC-98 INT DCh emulation now support INT DCh CL=0Ch/CL=0Dh
AX=FFh so that some programs (including SEDIT.EXE) can set,
re-define, and restore the function key row.
- PC-98 MS-DOS emulation now injects escape codes from a table
for the function keys instead of hard-coded as it does on
real MS-DOS.
- PC-98 MS-DOS emulation now supports Shift+Fn (shift+Function)
to inject shortcuts into the CON device.
- PC-98 MS-DOS now accepts CTRL+F8 to clear the screen.
- PC-98 MS-DOS function key row now accepts CTRL+F7 to toggle
between none, function keys, and shortcuts.
- PC-98 INT 18h AH=42h display area setup now cancels pending
vsync interrupt. This fixes display issues with Quarth when
interrupting the game's demo mode to enter the main menu.
- PC-98 emulation now emulates port 6Ah command that controls
128KB/256KB VRAM wraparound.
- INT DCh CL=10h AH=04h through AH=09h added.
- INT DCh CL=10h AH=03h call to set cursor position (backdoor for
ESC = ANSI code) added.
- Added parsing for ESC M / ESC D and ESC E in the DOS ANSI driver.
- New debugger "VGA" command added to view additional emulator
state.
- Debugger input bar (at the bottom) fixed to position correctly,
mistake in the code that caused it fixed.
- PC98 debugger command now supports viewing text, graphics, CG,
GRCG, and EGC state.
- New debugger command "PC98" to view PC-98 emulation state in
the debugger.
- New debugger command "EMU" added to view additional emulator
state.
- Debugger data view now shows linear and physical memory address
for the memory address you're viewing when the CPU is in
protected mode. The physical memory address display is useful
when 386 paging is enabled.
- Debugger command "SM" now accept B: W: and D: prefixes to
write BYTE, WORD, and DWORD values to memory.
- Debugger command "SR" now accept multiple pairs of registers
and values in one command.
- Debugger commands "EV" and "SM" will no longer hang DOSBox-X
on invalid (unrecognized) input.
- Added "EV" debugger command to allow viewing CPU registers
at the command line, including CPU registers not shown
in one of the windows of the debugger UI.
- Debugger will now explicitly tell you if it does not
recognize the command.
- Debugger fixed not to leave your command uppercased on the
command line if it does not recognize it.
- Debugger "SR" command updated to allow setting upper/lower
halves of AX/BX/CX/DX, additional CPU flags and the whole
flags register.
- Added INP/OUTP commands to debugger to aid debugging
I/O ports.
- 8086 and 286 cores now emulate a known bug where an
instruction with multiple prefixes that is interrupted
will resume at only the most recent prefix.
- PC-98 planar emulation optimized and cleaned up.
- Configuration GUI no longer crashes at startup if run
from the command line using the --startui or --startgui
command line options.
- Configuration GUI fixed not to allow multiple instances
of the same settings window.
- Emulator speed controls added, if for any reason you'd
want to play a game faster or slower.
- Configuration GUI AUTOEXEC editor fixed so that
"Append History" button actually works.
- Fixed configuration GUI to show keyboard options instead
of the mapper interface when you click the "Keyboard"
button.
- "Show details" menu option now also enables the realtime
percentage display.
- Mac OS X builds fixed to use older convertRectToScreen
function instead of convertPointToScreen, which allows
others to compile DOSBox-X on Mac OS X versions older than
Mojave (despite Apple documentation claiming that
convertPointToScreen was added in 10.12).
- Shift and Alt key modifier handling within the configuration
GUI now works properly in SDL2 builds.
- Fixed prefetch queue emulation to allow 8086, 80186, and
286 CPU types to run with prefetch queue without crashing.
- CPU type selection menu will now cause guest to reboot
if new cpu type is incompatible with the BIOS prologue
and epilogue code that was generated at startup, to
avoid crashes.
- PC-98 NEC copyright string option now also installs
another set of data in another location in the BIOS,
that Windows 2.1 checks for.
- Minimum MCB free value now has a higher default value in
PC-98 mode to reflect the fact the platform usually has
more loaded into lower memory at runtime. You are allowed
to specify a lower value in dosbox.conf for anything that
needs more memory.
- GUS and Sound Blaster environment variable installation
is now quiet, does not echo the variable on screen at
startup.
- INT 21h country-specific info now returns correct info
for PC-98 mode.
- INT 21h DBCS lead table now contains correct values in
PC-98 mode.
- Added more PC-98 EGC raster opcode emulation. The PC-98
version of Windows 3.1 now displays properly without
issues, except for line drawing.
- Added INT 10h VESA BIOS function AH=08h "SET DAC WIDTH"
so that, when enabled, DOS applications can switch the
DAC from 6-bit to 8-bit.
- Added basic 256-color mode emulation to PC-98 mode.
Linear framebuffer, needed by PC-98 ports of DOOM and
Wolfenstein 3D, is implemented. Bank switching, needed
by a few PC-98 games, is implemented.
- MPU-401 emulation now accepts dosbox.conf option "mpubase"
to control the base I/O port of the MPU-401 interface.
The option can be set to "0" to tell DOSBox-X to pick the
best default. Works in either IBM PC or NEC PC-98 mode.
See dosbox.reference.conf for more details.
- Fixed Sound Blaster 16 mixer IRQ/DMA select registers
to work in PC-98 mode as they apparently do on real
hardware.
- Sound Blaster 16 and Adlib emulation now available in
NEC PC-98 mode. I/O port mapping is based on a real
SB16 card for PC-98 and some documentation. Only OPL3
emulation is supported for Adlib. sbtype must be set
to sb16.
- NEC PC-98 emulation mode now emulates DMA controller.
- Gravis Ultrasound emulation now allows game to read back
the channel's Pan Pot register.
- Sound Blaster 16 now implements 0xF9/0xFA fully, even if
the RAM contents they expose are not fully implemented.
- Sound Blaster DSP command E2h (DMA identification/test)
code cleaned up and simplified.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9aa656940597a0191b581f116de268fdaa893dc6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
dosbox-x/Makefile | 4 +++-
dosbox-x/distinfo | 10 +++++-----
dosbox-x/patches/patch-configure.ac | 18 +++++++++---------
3 files changed, 17 insertions(+), 15 deletions(-)
diffs:
diff --git a/dosbox-x/Makefile b/dosbox-x/Makefile
index 357d97ef94..c6e646392d 100644
--- a/dosbox-x/Makefile
+++ b/dosbox-x/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
GITHUB_PROJECT= dosbox-x
-PKGNAME= dosbox-x-0.82.17
+PKGNAME= dosbox-x-0.82.19
DISTNAME= ${GITHUB_TAG}
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/}
@@ -29,6 +29,8 @@ PKGCONFIG_OVERRIDE+= vs2015/zlib/zlib.pc.in
CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/androidbuildlibs.sh
CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/iosbuild.sh
+NOT_PAX_MPROTECT_SAFE= bin/dosbox-x
+
pre-configure:
cd ${WRKSRC} && ${SH} autogen.sh
diff --git a/dosbox-x/distinfo b/dosbox-x/distinfo
index 9aec6c03f4..616dc56420 100644
--- a/dosbox-x/distinfo
+++ b/dosbox-x/distinfo
@@ -1,9 +1,9 @@
$NetBSD$
-SHA1 (dosbox-x-v0.82.17.tar.gz) = d24e45e20f5ef9a62debfc67936eecd6bd1d4671
-RMD160 (dosbox-x-v0.82.17.tar.gz) = 7ba64a200e769e7a31796d8d489a4f4eea3369ed
-SHA512 (dosbox-x-v0.82.17.tar.gz) = 721b6421d2ad8ed7197e6a7edf905f47e42069706d9ab1c85c46ab6beef971e73e0b25c02330e0df716ec52078d535fd04bf9c3402c8ea0740c67a4f9b2317fa
-Size (dosbox-x-v0.82.17.tar.gz) = 35987890 bytes
-SHA1 (patch-configure.ac) = 9f4501c638557deed0757d08e4db5298a2622bfc
+SHA1 (dosbox-x-v0.82.19.tar.gz) = f7a23eb515f4e162dd1ca22bd860ccfaabfaba93
+RMD160 (dosbox-x-v0.82.19.tar.gz) = 184163ac610ea5e3cac623b2563c5940346bd5a7
+SHA512 (dosbox-x-v0.82.19.tar.gz) = 1ee4b637db616d382608df42496247ca2f81775f38b0e2137a7fbeb911a17d2ce1a47a80184c848fe5b127f28215bfcbbc9183a981794e6d69359012f9199354
+Size (dosbox-x-v0.82.19.tar.gz) = 36002918 bytes
+SHA1 (patch-configure.ac) = 12028b528aa1f4b4d13a25c144954d9f69755e6b
SHA1 (patch-include_byteorder.h) = 86eccfbc2318ddc8d71a6de8723947a48d98a126
SHA1 (patch-include_dos__inc.h) = 26ba2b11dcfa923085f3745b0f8aca542f5dc692
diff --git a/dosbox-x/patches/patch-configure.ac b/dosbox-x/patches/patch-configure.ac
index e0b11427b3..cbe13fe0a8 100644
--- a/dosbox-x/patches/patch-configure.ac
+++ b/dosbox-x/patches/patch-configure.ac
@@ -2,7 +2,7 @@ $NetBSD$
Fix == test in configure script.
---- configure.ac.orig 2019-04-06 04:12:19.000000000 +0000
+--- configure.ac.orig 2019-06-01 03:37:41.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
-@@ -290,7 +290,7 @@ case "$host" in
+@@ -297,7 +297,7 @@ case "$host" in
;;
esac
@@ -47,7 +47,7 @@ Fix == test in configure script.
CXXFLAGS="$CXXFLAGS"
else
dnl Some default CPU flags
-@@ -413,8 +413,8 @@ case "$host" in
+@@ -419,8 +419,8 @@ case "$host" in
esac
fi
@@ -58,7 +58,7 @@ Fix == test in configure script.
dnl The target cpu checks for dynamic cores
AH_TEMPLATE(C_TARGETCPU,[The type of cpu this target has])
-@@ -600,7 +600,7 @@ fi
+@@ -611,7 +611,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 +67,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)
-@@ -610,7 +610,7 @@ fi
+@@ -621,7 +621,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 +76,7 @@ Fix == test in configure script.
if test x$enable_scaler_full_line = xyes; then
AC_DEFINE(C_SCALER_FULL_LINE,1)
fi
-@@ -652,7 +652,7 @@ else
+@@ -663,7 +663,7 @@ else
enable_mt32=no
AC_MSG_RESULT(no)
fi
@@ -85,12 +85,12 @@ Fix == test in configure script.
dnl NASM (Netwide Assembler)
AC_PATH_PROG([NASM], [nasm])
-@@ -1000,7 +1000,7 @@ else
+@@ -993,7 +993,7 @@ else
AC_MSG_RESULT(no)
fi
-AM_CONDITIONAL(C_DIRECT3D, test x"$do_d3d" == x"1")
+AM_CONDITIONAL(C_DIRECT3D, test x"$do_d3d" = x"1")
- AC_CONFIG_FILES([
- Makefile
+ AH_TEMPLATE(C_ICONV,[Define to 1 to use GNU libiconv])
+ if test x$have_iconv_h = xyes; then
Home |
Main Index |
Thread Index |
Old Index