From 3ecf6de652901fbd4ce5d1d624dd0c10e298f61f Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Wed, 2 Oct 2024 13:29:02 -0600
Subject: [PATCH] LibMedia+Ladybird: Use pkg_check_modules to find pulseaudio

---
 Ladybird/WebContent/CMakeLists.txt         | 5 +----
 Meta/CMake/pulseaudio.cmake                | 8 ++++++++
 Meta/Lagom/CMakeLists.txt                  | 2 --
 Tests/LibMedia/CMakeLists.txt              | 4 ----
 Userland/Libraries/LibMedia/CMakeLists.txt | 5 +++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 Meta/CMake/pulseaudio.cmake

diff --git a/Ladybird/WebContent/CMakeLists.txt b/Ladybird/WebContent/CMakeLists.txt
index b99a0c8d6b0..aabb83ce0c2 100644
--- a/Ladybird/WebContent/CMakeLists.txt
+++ b/Ladybird/WebContent/CMakeLists.txt
@@ -1,4 +1,5 @@
 include(fontconfig)
+include(pulseaudio)
 
 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)
 
-if (HAVE_PULSEAUDIO)
-    target_compile_definitions(webcontentservice PUBLIC HAVE_PULSEAUDIO=1)
-endif()
-
 if (HAS_FONTCONFIG)
     target_link_libraries(webcontentservice PRIVATE Fontconfig::Fontconfig)
 endif()
diff --git a/Meta/CMake/pulseaudio.cmake b/Meta/CMake/pulseaudio.cmake
new file mode 100644
index 00000000000..6b73a9fbf8e
--- /dev/null
+++ b/Meta/CMake/pulseaudio.cmake
@@ -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()
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index ec795f26fdb..8019322d7e5 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -132,8 +132,6 @@ if (ENABLE_FUZZERS)
     add_cxx_compile_options(-fno-omit-frame-pointer)
 endif()
 
-CHECK_INCLUDE_FILE(pulse/pulseaudio.h HAVE_PULSEAUDIO)
-
 add_library(JSClangPlugin INTERFACE)
 add_library(GenericClangPlugin INTERFACE)
 
diff --git a/Tests/LibMedia/CMakeLists.txt b/Tests/LibMedia/CMakeLists.txt
index d7740641a9d..232f995e7fa 100644
--- a/Tests/LibMedia/CMakeLists.txt
+++ b/Tests/LibMedia/CMakeLists.txt
@@ -10,7 +10,3 @@ set(TEST_SOURCES
 foreach(source IN LISTS TEST_SOURCES)
     lagom_test("${source}" LibMedia LIBS LibMedia LibFileSystem WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 endforeach()
-
-if (HAVE_PULSEAUDIO)
-    target_compile_definitions(TestPlaybackStream PRIVATE HAVE_PULSEAUDIO=1)
-endif()
diff --git a/Userland/Libraries/LibMedia/CMakeLists.txt b/Userland/Libraries/LibMedia/CMakeLists.txt
index dd62c9c5580..5227f2cc34d 100644
--- a/Userland/Libraries/LibMedia/CMakeLists.txt
+++ b/Userland/Libraries/LibMedia/CMakeLists.txt
@@ -1,4 +1,5 @@
 include(ffmpeg)
+include(pulseaudio)
 
 set(SOURCES
     Audio/Loader.cpp
@@ -33,8 +34,8 @@ if (HAVE_PULSEAUDIO)
         Audio/PlaybackStreamPulseAudio.cpp
         Audio/PulseAudioWrappers.cpp
     )
-    target_link_libraries(LibMedia PRIVATE pulse)
-    target_compile_definitions(LibMedia PRIVATE HAVE_PULSEAUDIO=1)
+    target_link_libraries(LibMedia PRIVATE PkgConfig::PULSEAUDIO)
+    target_compile_definitions(LibMedia PUBLIC HAVE_PULSEAUDIO=1)
 elseif (APPLE AND NOT IOS)
     target_sources(LibMedia PRIVATE Audio/PlaybackStreamAudioUnit.cpp)