wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6e2a54ec76d225d76506fe909a9c300702636d5b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-07-07 08:50:59 +10:00
parent 4f13965432
commit 21a97e1f88
3 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "51dd1ba02e4a96a3e0c9381a434bfd1fd4347d83"
echo "6e2a54ec76d225d76506fe909a9c300702636d5b"
}
# Show version information
@ -6374,11 +6374,9 @@ fi
# | dlls/xactengine3_5/xactengine3_5.spec, dlls/xactengine3_6/Makefile.in, dlls/xactengine3_6/xactengine3_6.spec,
# | dlls/xactengine3_7/Makefile.in, dlls/xactengine3_7/xactengine3_7.spec, dlls/xaudio2_7/Makefile.in,
# | dlls/xaudio2_7/tests/Makefile.in, dlls/xaudio2_7/tests/globals.xgs, dlls/xaudio2_7/tests/rsrc.rc,
# | dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c, dlls/xaudio2_7/xact_classes.idl, dlls/xaudio2_7/xact_dll.c,
# | include/xact3.h
# | dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c, dlls/xaudio2_7/xact_classes.idl, dlls/xaudio2_7/xact_dll.c
# |
if test "$enable_xactengine_initial" -eq 1; then
patch_apply xactengine-initial/0001-include-Correct-a-spelling-error-in-the-definition-o.patch
patch_apply xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch
patch_apply xactengine-initial/0003-xaudio2_7-Support-older-XACT3Engine-interfaces.patch
patch_apply xactengine-initial/0004-xaudio2_7-IXACT3Engine-Initialize-return-valid-error.patch
@ -6391,7 +6389,6 @@ if test "$enable_xactengine_initial" -eq 1; then
patch_apply xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch
patch_apply xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch
(
printf '%s\n' '+ { "Bernhard Rosenkränzer", "include: Correct a spelling error in the definition of IXACT3Engine_Initialize.", 1 },';
printf '%s\n' '+ { "Ethan Lee", "xaudio2: Add support for xactengine3.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Support older XACT3Engine interfaces.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: IXACT3Engine Initialize return valid error code.", 1 },';

27
patches/xactengine-initial/0001-include-Correct-a-spelling-error-in-the-definition-o.patch
View File

@ -1,27 +0,0 @@
From 0fa73610b1527bd2557d34d8575cdaa89f2b23aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
Date: Sun, 5 Jul 2020 11:33:43 -0500
Subject: [PATCH] include: Correct a spelling error in the definition of
IXACT3Engine_Initialize.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
---
include/xact3.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/xact3.h b/include/xact3.h
index d66874a511d..80059c124a5 100644
--- a/include/xact3.h
+++ b/include/xact3.h
@@ -679,7 +679,7 @@ DECLARE_INTERFACE_(IXACT3Engine,IUnknown)
#define IXACT3Engine_GetRendererCount(p,a) (p)->lpVtbl->GetRendererCount(p,a)
#define IXACT3Engine_GetRendererDetails(p,a,b) (p)->lpVtbl->GetRendererDetails(p,a,b)
#define IXACT3Engine_GetFinalMixFormat(p,a) (p)->lpVtbl->GetFinalMixFormat(p,a)
-#define IXACT3Engine_Initialize(p,a) (p)->lpVtbl->Initialze(p,a)
+#define IXACT3Engine_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
#define IXACT3Engine_Shutdown(p) (p)->lpVtbl->Shutdown(p)
#define IXACT3Engine_DoWork(p) (p)->lpVtbl->DoWork(p)
#define IXACT3Engine_CreateSoundBank(p,a,b,c,d,e) (p)->lpVtbl->CreateSoundBank(p,a,b,c,d,e)
--
2.27.0

2
staging/upstream-commit
View File

@ -1 +1 @@
51dd1ba02e4a96a3e0c9381a434bfd1fd4347d83
6e2a54ec76d225d76506fe909a9c300702636d5b