Xargon/net.rpcs3.RPCS3
1
0
Fork 0
mirror of https://github.com/RetroDECK/net.rpcs3.RPCS3.git synced 2024-11-23 09:05:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #706 from flathub/update-b5cf1bb

Browse source 
Update 2 modules
This commit is contained in:
Lctrs 2021-12-02 12:33:03 +01:00 committed by GitHub
parent 706679f659 04c742aeb0
commit b1ce9fa2e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net.rpcs3.RPCS3.yaml
View file

@ -71,15 +71,13 @@ modules:
- /lib/pkgconfig - /lib/pkgconfig
sources: sources:
- type: archive - type: archive
url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/21.11.tar.gz url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/21.12.tar.gz
sha256: 1389100ca132e06455ad7e4e765a045d9821c234f6e388bef6a0c8d610ce36d1 sha256: c69d1b7098c018a787311d6f2bfdbc3782e88407f219ea53213f052284f9cb14
x-checker-data: x-checker-data:
type: anitya type: anitya
project-id: 20663 project-id: 20663
stable-only: true stable-only: true
url-template: https://github.com/FNA-XNA/FAudio/archive/refs/tags/$version.tar.gz url-template: https://github.com/FNA-XNA/FAudio/archive/refs/tags/$version.tar.gz
- type: patch
path: patches/faudio/fix-faudio.patch
- name: flatbuffers - name: flatbuffers
buildsystem: cmake-ninja buildsystem: cmake-ninja
@ -222,4 +220,4 @@ modules:
- type: git - type: git
url: https://github.com/RPCS3/rpcs3.git url: https://github.com/RPCS3/rpcs3.git
branch: master branch: master
commit: 9bb46aa9442d3d655860f499d08a70d17fc4756d commit: 0ab36ef44d2dd30b67427e9fa89fae988e6d131c

31
patches/faudio/fix-faudio.patch
View file

@ -1,31 +0,0 @@
From de0c1f833c12a992af5c7daebe1705cd2c72f743 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <steve@sk2.org>
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 <steve@sk2.org>
---
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 */