Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Audio Buffering GUI setting not available for the FAudio backend #6866

Merged
merged 3 commits into from Oct 24, 2019

Conversation

Oschowa
Copy link
Contributor

@Oschowa Oschowa commented Oct 24, 2019

Also update FAudio to 19.10

@Nekotekina
Copy link
Member

Well, it seems not compatible with Ubuntu 18.04 out of the box because it only has SDL 2.0.8 or something yet needs 2.0.9 to build. Probably need to add SDL version check in CMakeLists.txt.

@Oschowa
Copy link
Contributor Author

Oschowa commented Oct 24, 2019

Where do you see the failures, and do they only happen because of the update to faudio 19.10? It looks like the Travis bot succeeded?

@RipleyTom
Copy link
Contributor

You may want to add
ignore = dirty

To the faudio submodule in .gitmodules so that it tracks only commit and not individual files.

@Nekotekina
Copy link
Member

@Oschowa Travis didn't include FAudio I believe. AppImage doens't have FAudio.
Error happens on master, compiling FAudio_platform_sdl2.c
#pragma message("Please update to SDL 2.0.9 ASAP!")

@Nekotekina
Copy link
Member

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 5de99ee24..6dfd7d21a 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -342,7 +342,9 @@ set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
        # FAudio depends on SDL2
        pkg_check_modules(SDL2 sdl2)
-       if(SDL2_FOUND)
+       if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9)
+               message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
+       else()
                add_subdirectory(FAudio EXCLUDE_FROM_ALL)
                target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)
                set(FAUDIO_TARGET FAudio)

@Oschowa
Copy link
Contributor Author

Oschowa commented Oct 24, 2019

Made the changes, but i'm curious why travis would skip building the backend.
Although i guess it would be pointless anyways if it doesn't have SDL >= 2.0.9.

@Nekotekina Nekotekina merged commit 6944e18 into RPCS3:master Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants