fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibMedia+Ladybird: Use pkg_check_modules to find pulseaudio

Browse Source
This commit is contained in:
Andrew Kaster
2024-10-02 13:29:02 -06:00
committed by Tim Flynn
parent 2106617f5b
commit 3ecf6de652
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ladybird/WebContent/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
include(fontconfig) include(fontconfig)
include(pulseaudio)
set(WEBCONTENT_SOURCE_DIR ${LADYBIRD_SOURCE_DIR}/Userland/Services/WebContent/) set(WEBCONTENT_SOURCE_DIR ${LADYBIRD_SOURCE_DIR}/Userland/Services/WebContent/)
@@ -36,10 +37,6 @@ target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${CMAKE_CU
target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient) target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient)
if (HAVE_PULSEAUDIO)
target_compile_definitions(webcontentservice PUBLIC HAVE_PULSEAUDIO=1)
endif()
if (HAS_FONTCONFIG) if (HAS_FONTCONFIG)
target_link_libraries(webcontentservice PRIVATE Fontconfig::Fontconfig) target_link_libraries(webcontentservice PRIVATE Fontconfig::Fontconfig)
endif() endif()

8
Meta/CMake/pulseaudio.cmake Normal file
View File

@@ -0,0 +1,8 @@
include_guard()
find_package(PkgConfig REQUIRED)
pkg_check_modules(PULSEAUDIO IMPORTED_TARGET libpulse)
if (PULSEAUDIO_FOUND)
set(HAVE_PULSEAUDIO ON CACHE BOOL "" FORCE)
endif()

2
Meta/Lagom/CMakeLists.txt
View File

@@ -132,8 +132,6 @@ if (ENABLE_FUZZERS)
add_cxx_compile_options(-fno-omit-frame-pointer) add_cxx_compile_options(-fno-omit-frame-pointer)
endif() endif()
CHECK_INCLUDE_FILE(pulse/pulseaudio.h HAVE_PULSEAUDIO)
add_library(JSClangPlugin INTERFACE) add_library(JSClangPlugin INTERFACE)
add_library(GenericClangPlugin INTERFACE) add_library(GenericClangPlugin INTERFACE)

4
Tests/LibMedia/CMakeLists.txt
View File

@@ -10,7 +10,3 @@ set(TEST_SOURCES
foreach(source IN LISTS TEST_SOURCES) foreach(source IN LISTS TEST_SOURCES)
lagom_test("${source}" LibMedia LIBS LibMedia LibFileSystem WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") lagom_test("${source}" LibMedia LIBS LibMedia LibFileSystem WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
endforeach() endforeach()
if (HAVE_PULSEAUDIO)
target_compile_definitions(TestPlaybackStream PRIVATE HAVE_PULSEAUDIO=1)
endif()

5
Userland/Libraries/LibMedia/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
include(ffmpeg) include(ffmpeg)
include(pulseaudio)
set(SOURCES set(SOURCES
Audio/Loader.cpp Audio/Loader.cpp
@@ -33,8 +34,8 @@ if (HAVE_PULSEAUDIO)
Audio/PlaybackStreamPulseAudio.cpp Audio/PlaybackStreamPulseAudio.cpp
Audio/PulseAudioWrappers.cpp Audio/PulseAudioWrappers.cpp
) )
target_link_libraries(LibMedia PRIVATE pulse) target_link_libraries(LibMedia PRIVATE PkgConfig::PULSEAUDIO)
target_compile_definitions(LibMedia PRIVATE HAVE_PULSEAUDIO=1) target_compile_definitions(LibMedia PUBLIC HAVE_PULSEAUDIO=1)
elseif (APPLE AND NOT IOS) elseif (APPLE AND NOT IOS)
target_sources(LibMedia PRIVATE Audio/PlaybackStreamAudioUnit.cpp) target_sources(LibMedia PRIVATE Audio/PlaybackStreamAudioUnit.cpp)