diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 17073ac..9c0856f 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -71,13 +71,15 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/21.10.tar.gz - sha256: eca3e2cc148f9b25e8ce61153f3f552a385cdaa903f691af0a53932cc10cfb39 + url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/21.11.tar.gz + sha256: 1389100ca132e06455ad7e4e765a045d9821c234f6e388bef6a0c8d610ce36d1 x-checker-data: type: anitya 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 @@ -169,13 +171,18 @@ modules: - -DLLVM_USE_INTEL_JITEVENTS=ON - -DLLVM_ENABLE_Z3_SOLVER=OFF - -DCMAKE_CXX_STANDARD=17 + - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi cleanup: - '*' sources: - type: git url: https://github.com/RPCS3/llvm-mirror.git branch: master - commit: 5836324d6443a62ed09b84c125029e98324978c3 + commit: 18f153b33bef2a4e29a0478ddd374b1f19316a46 + - type: git + url: https://github.com/intel/ittapi.git + dest: ittapi/ittapi + disable-shallow-clone: true - name: rpcs3 buildsystem: cmake-ninja @@ -215,4 +222,4 @@ modules: - type: git url: https://github.com/RPCS3/rpcs3.git branch: master - commit: 37383f4217e1c510a543e100d0ca495800b3361a + commit: 1a0392bf15fc01e55eda94f5e886a88844c25ad0 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 */ +