diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 082cace5..42671240 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f712a98d12d091c5437159a291857dfb9f0cea7c" + echo "fdc2d415b0dd5c12c83156bd41161ff135d25105" } # Show version information @@ -2429,7 +2429,7 @@ fi # Patchset ntdll-HashLinks # | # | Modified files: -# | * dlls/kernel32/tests/loader.c, dlls/ntdll/loader.c, include/winternl.h +# | * dlls/kernel32/tests/loader.c, dlls/ntdll/loader.c # | if test "$enable_ntdll_HashLinks" -eq 1; then patch_apply ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch diff --git a/patches/xactengine-initial/0001-x3daudio1_7-Create-import-library.patch b/patches/xactengine-initial/0001-x3daudio1_7-Create-import-library.patch index 0c84c6f8..bf00b0bd 100644 --- a/patches/xactengine-initial/0001-x3daudio1_7-Create-import-library.patch +++ b/patches/xactengine-initial/0001-x3daudio1_7-Create-import-library.patch @@ -1,4 +1,4 @@ -From 03d74fd162643ccc362dd3405a1df0328645cf24 Mon Sep 17 00:00:00 2001 +From 9c11f23079351f107a3bbcd3cd274f0a5656518f Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 1 Oct 2020 18:37:06 +1000 Subject: [PATCH] x3daudio1_7: Create import library @@ -8,7 +8,7 @@ Subject: [PATCH] x3daudio1_7: Create import library 1 file changed, 1 insertion(+) diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in -index 267a93fd6da..5438bc6d801 100644 +index c6a8ed5102a..323d3fad60a 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,5 +1,6 @@ @@ -16,8 +16,8 @@ index 267a93fd6da..5438bc6d801 100644 MODULE = x3daudio1_7.dll +IMPORTLIB = x3daudio1_7 PARENTSRC = ../xaudio2_7 - EXTRALIBS = $(FAUDIO_LIBS) - EXTRAINCL = $(FAUDIO_CFLAGS) + IMPORTS = $(FAUDIO_PE_LIBS) + EXTRAINCL = $(FAUDIO_PE_CFLAGS) -- -2.28.0 +2.33.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 4fe5eab6..fd710bcd 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -f712a98d12d091c5437159a291857dfb9f0cea7c +fdc2d415b0dd5c12c83156bd41161ff135d25105