mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 15:32:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

Audaspace: Enforce minimal pipewire library version

Browse source 
While I implemented pipewire support I forgot that some of the functions I use is not available in older pipewire versions.

This adds proper library version sanity checks for pipewire.

Pull Request: https://projects.blender.org/blender/blender/pulls/131610
This commit is contained in:
Sebastian Parborg 2025-01-06 18:19:08 +01:00 committed by Sebastian Parborg
parent 4edf250a65
commit bb53214661
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_files/cmake/platform/platform_unix.cmake
View file

@ -724,7 +724,7 @@ endif()
# PipeWire is intended to use the system library. # PipeWire is intended to use the system library.
if(WITH_PIPEWIRE) if(WITH_PIPEWIRE)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(PIPEWIRE libpipewire-0.3) pkg_check_modules(PIPEWIRE libpipewire-0.3>=1.1.0)
set_and_warn_library_found("PipeWire" PIPEWIRE_FOUND WITH_PIPEWIRE) set_and_warn_library_found("PipeWire" PIPEWIRE_FOUND WITH_PIPEWIRE)
endif() endif()

2
extern/audaspace/CMakeLists.txt vendored
View file

@ -727,7 +727,7 @@ endif()
if(WITH_PIPEWIRE) if(WITH_PIPEWIRE)
if(AUDASPACE_STANDALONE) if(AUDASPACE_STANDALONE)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(PIPEWIRE ${PACKAGE_OPTION} libpipewire-0.3) pkg_check_modules(PIPEWIRE ${PACKAGE_OPTION} libpipewire-0.3>=1.1.0)
endif() endif()
if(PIPEWIRE_FOUND) if(PIPEWIRE_FOUND)

2
extern/audaspace/plugins/pipewire/PipeWireLibrary.cpp vendored
View file

@ -53,7 +53,7 @@ bool loadPipeWire()
#undef PIPEWIRE_SYMBOL #undef PIPEWIRE_SYMBOL
return AUD_pw_init != nullptr; return AUD_pw_check_library_version != nullptr && AUD_pw_check_library_version(1,1,0);
} }
AUD_NAMESPACE_END AUD_NAMESPACE_END

1
extern/audaspace/plugins/pipewire/PipeWireSymbols.h vendored
View file

@ -38,3 +38,4 @@ PIPEWIRE_SYMBOL(pw_thread_loop_new);
PIPEWIRE_SYMBOL(pw_thread_loop_start); PIPEWIRE_SYMBOL(pw_thread_loop_start);
PIPEWIRE_SYMBOL(pw_thread_loop_stop); PIPEWIRE_SYMBOL(pw_thread_loop_stop);
PIPEWIRE_SYMBOL(pw_check_library_version);