From 924743e61234e6d1b8a3887b25b5186e66e10f70 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Sun, 29 Mar 2020 15:52:23 +0300
Subject: meson: Remove libpulse dep from libpulsecore

libpulsecore is not supposed to depend on the client library.

Removing the dependency caused build failures, which are fixed by adding
more stuff to libpulsecommon.
---
 src/meson.build           | 4 ++++
 src/pulsecore/meson.build | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/meson.build b/src/meson.build
index 832c0de0d..8d74a3164 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,10 @@
 libpulsecommon_sources = [
   'pulse/client-conf.c',
+  'pulse/error.c',
   'pulse/fork-detect.c',
   'pulse/format.c',
   'pulse/json.c',
+  'pulse/mainloop-api.c',
   'pulse/xmalloc.c',
   'pulse/proplist.c',
   'pulse/utf8.c',
@@ -71,9 +73,11 @@ libpulsecommon_sources = [
 
 libpulsecommon_headers = [
   'pulse/client-conf.h',
+  'pulse/error.h',
   'pulse/fork-detect.h',
   'pulse/format.h',
   'pulse/json.h',
+  'pulse/mainloop-api.h',
   'pulse/xmalloc.h',
   'pulse/proplist.h',
   'pulse/utf8.h',
diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index 0bd596cbd..5f78be012 100644
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -198,7 +198,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
   install_rpath : privlibdir,
   install_dir : privlibdir,
   link_with : libpulsecore_simd_lib,
-  dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep],
+  dependencies : [libm_dep, libpulsecommon_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep],
   implicit_include_directories : false)
 
 libpulsecore_dep = declare_dependency(link_with: libpulsecore)
-- 
cgit v1.2.3