From 70e413933d7df8a931adb510bf4b17d31b3e76e2 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Mon, 7 Dec 2020 22:42:17 +0000
Subject: [PATCH] PulseAudio - reinstate updated switch re bluez, dbus, sbc.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23963 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 multimedia/libdriv/pulseaudio.xml  | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 1e25ee60e4..d870beff2b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>December 7th, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Allow pulseaudio-14 to build without BlueZ5 and SBC. Fixes
+          <ulink url="&blfs-ticket-root;14352">#14352</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to feh-3.6.1. Fixes
           <ulink url="&blfs-ticket-root;14349">#14349</ulink>.</para>
diff --git a/multimedia/libdriv/pulseaudio.xml b/multimedia/libdriv/pulseaudio.xml
index 7af582bd8f..8e5fb0d8d8 100644
--- a/multimedia/libdriv/pulseaudio.xml
+++ b/multimedia/libdriv/pulseaudio.xml
@@ -146,7 +146,7 @@ make</userinput></screen>
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-meson  --prefix=/usr -Ddatabase=gdbm &amp;&amp;
+meson  --prefix=/usr -Ddatabase=gdbm -Dbluez5=false &amp;&amp;
 ninja</userinput></screen>
 
     <para>
@@ -173,25 +173,23 @@ ninja</userinput></screen>
 <screen role="root"><userinput>rm -fv /etc/dbus-1/system.d/pulseaudio-system.conf</userinput></screen>
 
   </sect2>
-<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <parameter>- -disable-bluez5</parameter>: This switch prevents
+      <parameter>-Dbluez5=false</parameter>: This switch prevents
       a runtime error if <xref linkend="dbus"/> and <xref linkend="sbc"/>
       are both installed but <xref linkend="bluez"/> is not installed.
       Remove this if you have installed all three packages.
     </para>
-
+<!--
     <para>
       <parameter>- -disable-rpath</parameter>: This switch prevents
       linker from adding a hardcoded runtime path to the installed
       programs and libraries.
-    </para>
+    </para>-->
 
   </sect2>
--->
   <sect2 role="configuration">
     <title>Configuring PulseAudio</title>