Ticket #4667: pulseaudio.patch

general.ent

@@ -803 +803 @@
 <!ENTITY libvpx-version               "1.3.0">
 <!ENTITY opal-version                 "3.10.10">
 <!ENTITY opus-version                 "1.1">
-<!ENTITY pulseaudio-version           "4.0">
+<!ENTITY pulseaudio-major-version     "4.99">
+<!ENTITY pulseaudio-version           "&pulseaudio-major-version;.3">
 <!ENTITY sdl-version                  "1.2.15">
 <!ENTITY soundtouch-version           "1.8.0">
 <!ENTITY speex-version                "1.2rc1">

multimedia/libdriv/pulseaudio.xml

@@ -7 +7 @@
   <!ENTITY pulseaudio-download-http
            "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
   <!ENTITY pulseaudio-download-ftp  " ">
-  <!ENTITY pulseaudio-md5sum        "591f211db2790a7e4d222f2dc6858db3">
+  <!ENTITY pulseaudio-md5sum        "7c0d8f0edbe4556da05b51f8f31cf073">
   <!ENTITY pulseaudio-size          "1.4 MB">
-  <!ENTITY pulseaudio-buildsize     "105 MB">
+  <!ENTITY pulseaudio-buildsize     "110 MB">
   <!ENTITY pulseaudio-time          "2.0 SBU">
 ]>
 
@@ -88 +88 @@
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
       <xref linkend="dbus"/>,
+      <xref linkend="glib2"/>,
       <xref linkend="libcap"/>,
       <xref linkend="openssl"/>,
       <xref linkend="speex"/> and
-      <xref linkend="xorg7-lib"/> <!-- Useful for KDE, too -->
+      <xref linkend="xorg7-lib"/>
     </para>
 
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="GConf"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="gtk2"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="avahi"/>,
-      <xref linkend="bluez"/> and <xref linkend="sbc"/>,
+      <xref linkend="bluez"/> (runtime),
       <xref linkend="check"/>,
       <ulink url="http://www.fftw.org/">FFTW</ulink>,
+      <xref linkend="GConf"/>,
+      <xref linkend="gtk3"/>,
       <ulink url="http://www.jackaudio.org/">JACK</ulink>,
       <ulink url="http://0pointer.de/lennart/projects/libasyncns/">libasyncns</ulink>,
       <xref linkend="libsamplerate"/>,
       <ulink url="http://www.lirc.org/">LIRC</ulink>,
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
+      <xref linkend="sbc"/> (Bluetooth support),
       <ulink url="http://tdb.samba.org/">TDB</ulink>,
       <ulink url="http://valgrind.org/">Valgrind</ulink>,
       <ulink url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
@@ -118 +115 @@
       WebRTC AudioProcessing</ulink> and
       <ulink url="http://www.xen.org/">XEN</ulink>
     </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/pulseaudio"/>
     </para>
@@ -127 +125 @@
     <title>Installation of PulseAudio</title>
 
     <para>
-      In order for <application>PulseAudio</application> to communicate
-      properly with D-BUS, create a unique user. As the <systemitem
-      class="username">root</systemitem> user, run:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 58 pulse &amp;&amp;
-groupadd -g 59 pulse-access &amp;&amp;
-useradd -c "Pulseaudio User" -d /var/run/pulse -g pulse \
-        -s /bin/false -u 58 pulse &amp;&amp;
-usermod -a -G audio pulse</userinput></screen>
-
-    <para>
       Install <application>PulseAudio</application> by running the following
       commands:
     </para>
 
 <screen><userinput>find . -name "Makefile.in" | xargs sed -i "s|(libdir)/@PACKAGE@|(libdir)/pulse|" &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
+./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
             --libexecdir=/usr/lib \
+            --disable-bluez4      \
+            --disable-rpath       \
             --with-module-dir=/usr/lib/pulse/modules &amp;&amp;
 make</userinput></screen>
 
@@ -161 +149 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <!-- http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/ -->
+    <para>
+      While still as the <systemitem class="username">root</systemitem>
+      user, remove the <application>D-Bus</application> configuration file
+      for the system wide daemon to avoid creating unnecessary system
+      users and grups:
+    </para>
+
+<screen role="root"><userinput>rm /etc/dbus-1/system.d/pulseaudio-system.conf</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
@@ -175 +173 @@
     </para>
 
     <para>
+      <parameter>--disable-bluez4</parameter>: This switch disables
+      support for <application>BlueZ</application> version 4 in favour
+      of <application>BlueZ</application> version 5 since the latter
+      also installs compatibility library for the earlier version.
+    </para>
+
+    <para>
+      <parameter>--disable-rpath</parameter>: This switch prevents
+      linker from adding a hardcoded runtime path to the installed
+      programs and libraries.
+    </para>
+
+    <para>
       <parameter>--with-module-dir=/usr/lib/pulse/modules</parameter>:
       This parameter ensures that <application>PulseAudio</application>
       modules are installed in <filename class="directory">/usr/lib/pulse/modules
       </filename> instead of <filename class="directory">
-      /usr/lib/pulse-&pulseaudio-version;/modules</filename>.
+      /usr/lib/pulse-&pulseaudio-major-version;/modules</filename>.
     </para>
 
   </sect2>
@@ -199 +210 @@
           start-pulseaudio-kde and start-pulseaudio-x11
         </seg>
         <seg>
-          libpulsecore-&pulseaudio-version;.so, libpulse-mainloop-glib.so,
+          libpulsecore-&pulseaudio-major-version;.so, libpulse-mainloop-glib.so,
           libpulse-simple.so and libpulse.so
         </seg>
         <seg>

postlfs/config/users.xml

@@ -102 +102 @@
         <row><entry>stunnel </entry><entry>51</entry><entry>51</entry></row>
         <row><entry>svn     </entry><entry>56</entry><entry>56</entry></row>
         <row><entry>svntest </entry><entry>  </entry><entry>57</entry></row>
-        <row><entry>pulse   </entry><entry>58</entry><entry>58</entry></row>
-        <row><entry>pulse-access</entry><entry></entry><entry>59</entry></row>
+        <!-- <row><entry>pulse   </entry><entry>58</entry><entry>58</entry></row>
+        <row><entry>pulse-access</entry><entry></entry><entry>59</entry></row> -->
         <row><entry>games   </entry><entry>60</entry><entry>60</entry></row>
         <row><entry>kvm     </entry><entry>  </entry><entry>61</entry></row>
         <row><entry>wireshark</entry><entry> </entry><entry>62</entry></row>