From 04c742aeb0d50802a09f311b9c78083d4197faaa Mon Sep 17 00:00:00 2001 From: Lctrs Date: Thu, 2 Dec 2021 12:07:54 +0100 Subject: [PATCH] fix(faudio): remove out of date patch --- net.rpcs3.RPCS3.yaml | 2 -- patches/faudio/fix-faudio.patch | 31 ------------------------------- 2 files changed, 33 deletions(-) delete mode 100644 patches/faudio/fix-faudio.patch diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index f19fe11..6573657 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -78,8 +78,6 @@ 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 deleted file mode 100644 index 8b824eb..0000000 --- a/patches/faudio/fix-faudio.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 */ -