meson: Fix packaging error

- Exclude unsupported module-virtual-surround-sink
- Exclude unused pulseaudio-x11.service
- Enable bluetooth using previous dependancy checks
  (will be reverted to upstream when bluez updated)

Change-Id: I1437e4f4571a59610a35e60d4394d89f229dff9f

diff --git a/meson.build b/meson.build
index b26d00e..bbe554d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -787,10 +787,7 @@ else
 endif
 
 sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
-
-bluez_dep = dependency('bluez', required : get_option('bluez5'))
-
-if bluez_dep.found()
+if get_option('bluez5')
   assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
   assert(sbc_dep.found(), 'BlueZ requires SBC support')
   cdata.set('HAVE_SBC', 1)

diff --git a/meson_options.txt b/meson_options.txt
index dd5384e..45ca254 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -133,7 +133,7 @@ option('avahi',
        type : 'feature', value : 'auto',
        description : 'Optional Avahi support')
 option('bluez5',
-       type : 'feature', value : 'auto',
+       type : 'boolean', value : 'true',
        description : 'Optional BlueZ 5 support')
 option('bluez5-gstreamer',
        type : 'feature', value: 'auto',

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index eae0986..666313b 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -326,12 +326,12 @@ setcap -r /usr/bin/pulseaudio
 %{_libdir}/pulse-%{version}/modules/module-udev-detect.so
 %{_libdir}/pulse-%{version}/modules/module-virtual-sink.so
 %{_libdir}/pulse-%{version}/modules/module-virtual-source.so
-%{_libdir}/pulse-%{version}/modules/module-virtual-surround-sink.so
 %{_libdir}/pulse-%{version}/modules/module-volume-restore.so
 
 
 %exclude %{_unitdir_user}/pulseaudio.service
 %exclude %{_unitdir_user}/pulseaudio.socket
+%exclude %{_unitdir_user}/pulseaudio-x11.service
 %{_unitdir}/pulseaudio.service
 %if "%{tizen_profile_name}" == "tv"
 %{_unitdir}/sysinit.target.wants/pulseaudio.service

diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
index ca77ee6..99263bb 100644 (file)
--- a/src/modules/bluetooth/meson.build
+++ b/src/modules/bluetooth/meson.build
@@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util',
   c_args : [pa_c_args, server_c_args],
   link_args : [nodelete_link_args],
   include_directories : [configinc, topinc],
-  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
+  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
   install : true,
   install_rpath : privlibdir,
   install_dir : modlibexecdir,