Rebase against 788fd4ee44fc9877b01888fdd3cd72b9ac88228e.

This commit is contained in:
Alistair Leslie-Hughes
2021-04-21 11:40:13 +10:00
parent 33d85bda8a
commit 39f66ddd9f
6 changed files with 20 additions and 1133 deletions

View File

@@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "06ab0677587fbbb83ef73efa7ed22bf85dcb6836"
echo "788fd4ee44fc9877b01888fdd3cd72b9ac88228e"
}
# Show version information
@@ -293,7 +293,6 @@ patch_enable_all ()
enable_ws2_32_getsockopt="$1"
enable_wtsapi32_EnumerateProcesses="$1"
enable_xactengine_initial="$1"
enable_xactengine2_dll="$1"
enable_xactengine3_7_Notification="$1"
enable_xactengine3_7_PrepareWave="$1"
}
@@ -935,9 +934,6 @@ patch_enable ()
xactengine-initial)
enable_xactengine_initial="$2"
;;
xactengine2-dll)
enable_xactengine2_dll="$2"
;;
xactengine3_7-Notification)
enable_xactengine3_7_Notification="$2"
;;
@@ -4507,50 +4503,6 @@ if test "$enable_xactengine_initial" -eq 1; then
patch_apply xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch
fi
# Patchset xactengine2-dll
# |
# | This patchset fixes the following Wine bugs:
# | * [#41048] xactengine2_0: Roller Coaster Rampage
# | * [#49671] xactengine2_4: Supreme Commander demo
# | * [#49668] xactengine2_7: Two Worlds Epic Edition
# | * [#41468] xactengine2_9: Supreme Commander Forged Alliance
# |
# | Modified files:
# | * configure, configure.ac, dlls/xactengine2_0/Makefile.in, dlls/xactengine2_0/xactengine2_0.spec,
# | dlls/xactengine2_1/Makefile.in, dlls/xactengine2_1/xactengine2_1.spec, dlls/xactengine2_10/Makefile.in,
# | dlls/xactengine2_10/xact2_classes.idl, dlls/xactengine2_10/xact2_dll.c, dlls/xactengine2_10/xactengine2_10.spec,
# | dlls/xactengine2_2/Makefile.in, dlls/xactengine2_2/xactengine2_2.spec, dlls/xactengine2_3/Makefile.in,
# | dlls/xactengine2_3/xactengine2_3.spec, dlls/xactengine2_4/Makefile.in, dlls/xactengine2_4/xactengine2_4.spec,
# | dlls/xactengine2_5/Makefile.in, dlls/xactengine2_5/xactengine2_5.spec, dlls/xactengine2_6/Makefile.in,
# | dlls/xactengine2_6/xactengine2_6.spec, dlls/xactengine2_7/Makefile.in, dlls/xactengine2_7/xactengine2_7.spec,
# | dlls/xactengine2_8/Makefile.in, dlls/xactengine2_8/xactengine2_8.spec, dlls/xactengine2_9/Makefile.in,
# | dlls/xactengine2_9/xactengine2_9.spec, include/Makefile.in, include/xact.h, include/xact2wb.h
# |
if test "$enable_xactengine2_dll" -eq 1; then
patch_apply xactengine2-dll/0001-include-Add-xact2wb.h.patch
patch_apply xactengine2-dll/0002-include-Add-xact.h.patch
patch_apply xactengine2-dll/0003-xactengine2_10-Add-new-dll.patch
patch_apply xactengine2-dll/0004-xactengine2_10-Implement-IXACTEngine-interface.patch
patch_apply xactengine2-dll/0005-xactengine2_10-Implement-IXACTSoundBank-interface.patch
patch_apply xactengine2-dll/0006-xactengine2_10-Implement-IXACTCue-Interface.patch
patch_apply xactengine2-dll/0007-xactengine2_10-Implement-IXACTWaveBank-interface.patch
patch_apply xactengine2-dll/0008-xactengine2_10-Implement-IXACTEngine-CreateStreaming.patch
patch_apply xactengine2-dll/0009-xactengine2_10-Implement-IXACTWave-interface.patch
patch_apply xactengine2-dll/0010-xactengine2_10-Implement-IXACTSoundBank-Play-functio.patch
patch_apply xactengine2-dll/0011-xactengine2_10-Implement-IXACTWaveBank-Play-function.patch
patch_apply xactengine2-dll/0012-xactengine2_10-Implement-IXACTEngine-Un-RegisterNoti.patch
patch_apply xactengine2-dll/0013-xactengine2_9-New-Dll.patch
patch_apply xactengine2-dll/0014-xactengine2_8-New-Dll.patch
patch_apply xactengine2-dll/0015-xactengine2_7-New-Dll.patch
patch_apply xactengine2-dll/0016-xactengine2_6-New-Dll.patch
patch_apply xactengine2-dll/0017-xactengine2_5-New-Dll.patch
patch_apply xactengine2-dll/0018-xactengine2_4-New-Dll.patch
patch_apply xactengine2-dll/0019-xactengine2_3-New-Dll.patch
patch_apply xactengine2-dll/0020-xactengine2_2-New-Dll.patch
patch_apply xactengine2-dll/0021-xactengine2_1-New-Dll.patch
patch_apply xactengine2-dll/0022-xactengine2_0-New-Dll.patch
fi
# Patchset xactengine3_7-Notification
# |
# | This patchset fixes the following Wine bugs: