From 2f1628937afe752daded93d67434f3189540448b Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Wed, 10 Nov 2021 17:00:10 -0600 Subject: [PATCH] Update to 21.11 --- .gitignore | 2 +- FAudio-21.11-assert.patch | 31 +++++++++++++++++++++++++++++++ FAudio.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 FAudio-21.11-assert.patch diff --git a/.gitignore b/.gitignore index 1cdc913..88798df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/FAudio-21.09.tar.gz +/FAudio-21.11.tar.gz diff --git a/FAudio-21.11-assert.patch b/FAudio-21.11-assert.patch new file mode 100644 index 0000000..8b824eb --- /dev/null +++ b/FAudio-21.11-assert.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 */ + diff --git a/FAudio.spec b/FAudio.spec index 8437ed0..31b0328 100644 --- a/FAudio.spec +++ b/FAudio.spec @@ -1,11 +1,13 @@ Name: FAudio -Version: 21.09 +Version: 21.11 Release: 1%{?dist} Summary: FNA is a reimplementation of the Microsoft XNA Game Studio 4.0 Refresh libraries License: zlib URL: https://fna-xna.github.io/ Source0: https://github.com/FNA-XNA/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/FNA-XNA/FAudio/commit/de0c1f833c12a992af5c7daebe1705cd2c72f743 +Patch0: FAudio-21.11-assert.patch BuildRequires: cmake BuildRequires: gcc @@ -43,10 +45,11 @@ Development files for the FAudio library. %prep -%autosetup +%autosetup -p1 %build +# GStreamer support is deprecated and will be removed in the next release %cmake \ -DGSTREAMER=ON %cmake_build @@ -77,6 +80,9 @@ Development files for the FAudio library. %changelog +* Wed Nov 10 2021 Michael Cronenworth - 21.11-1 +- Update to 21.11 + * Tue Sep 07 2021 Michael Cronenworth - 21.09-1 - Update to 21.09 diff --git a/sources b/sources index 3e17c06..ae38ef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FAudio-21.09.tar.gz) = d6b95c8bb35c286ad3ed2cd12ea225e0a54da9a54e6ab86acda753823645482dda8f1826d7e5ad0a0687d685fc5628410e9b1972821df47b4657d9c8e75b27fa +SHA512 (FAudio-21.11.tar.gz) = b5e40e7c6aa83bb08376227d92d707e6d18f8391fbd0d4adec9d2b6a61dbd5851c95861eccba48b8aac69476880d70d8ea4f6a2942c9b631f87778b5ee3f2f6a