From 9dedf9252a0b7c031f6e5ef517f1fd4610946092 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Wed, 3 Nov 2021 15:12:40 +0100 Subject: [PATCH] faudio: add patch to fix build --- net.rpcs3.RPCS3.yaml | 2 ++ patches/faudio/fix-faudio.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 patches/faudio/fix-faudio.patch diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 572fff2..9a5f8d6 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -78,6 +78,8 @@ modules: project-id: 20663 stable-only: true url-template: https://github.com/FNA-XNA/FAudio/archive/refs/tags/$version.tar.gz + - type: patch + path: patches/faudio/fix-faudio.patch - name: flatbuffers buildsystem: cmake-ninja diff --git a/patches/faudio/fix-faudio.patch b/patches/faudio/fix-faudio.patch new file mode 100644 index 0000000..8b824eb --- /dev/null +++ b/patches/faudio/fix-faudio.patch @@ -0,0 +1,31 @@ +From de0c1f833c12a992af5c7daebe1705cd2c72f743 Mon Sep 17 00:00:00 2001 +From: Stephen Kitt +Date: Mon, 1 Nov 2021 17:25:07 +0100 +Subject: [PATCH] Fix unbalanced parentheses in FAudio.c + +Commit b5916945b90d ("Dont assert on WMA buffer and +FAUDIO_FORMAT_EXTENSIBLE type") introduced unbalanced parentheses, +which breaks builds using HAVE_WMADEC. + +Given the change made in the aforementioned commit, this balances +parentheses by adding a third closing parenthesis after the reworked +conditions. + +Signed-off-by: Stephen Kitt +--- + src/FAudio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/FAudio.c b/src/FAudio.c +index d3b0b4d8..ff373ef8 100644 +--- a/src/FAudio.c ++++ b/src/FAudio.c +@@ -2455,7 +2455,7 @@ uint32_t FAudioSourceVoice_SubmitSourceBuffer( + #ifdef HAVE_WMADEC + FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || + (voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2 || +- voice->src.format->wFormatTag == FAUDIO_FORMAT_EXTENSIBLE)) || ++ voice->src.format->wFormatTag == FAUDIO_FORMAT_EXTENSIBLE))) || + (voice->src.wmadec == NULL && (pBufferWMA == NULL && voice->src.format->wFormatTag != FAUDIO_FORMAT_XMAUDIO2)) ); + #endif /* HAVE_WMADEC */ +