[blfs-book] r21624 - in trunk/BOOK: introduction/welcome multimedia/libdriv

renodr at higgs.linuxfromscratch.org renodr at higgs.linuxfromscratch.org
Fri May 24 21:22:40 PDT 2019


Author: renodr
Date: Fri May 24 21:22:40 2019
New Revision: 21624

Log:
Adapt PulseAudio to ALSA API changes.

With ALSA 1.1.9, it became fatal to include headers from /usr/include rather than /usr/include/alsa, and the headers in /usr/include added a warning regarding this. Pulseaudio also doesn't use pkg-config for a large majority of it's headers (reported upstream), so a modification had to be done to account for that as well.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/pulseaudio.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Fri May 24 19:35:06 2019	(r21623)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Fri May 24 21:22:40 2019	(r21624)
@@ -44,6 +44,9 @@
     <listitem>
       <para>May 24th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt Pulseaudio to ALSA API Changes.</para>
+        </listitem>
         <listitem revision="sysv">
           <para>[dj] - Minor cleanups to network bootscripts.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/libdriv/pulseaudio.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/pulseaudio.xml	Fri May 24 19:35:06 2019	(r21623)
+++ trunk/BOOK/multimedia/libdriv/pulseaudio.xml	Fri May 24 21:22:40 2019	(r21624)
@@ -138,10 +138,22 @@
       commands:
     </para>
 
-<!--<screen><userinput>patch -Np1 -i ../pulseaudio-&pulseaudio-version;-glibc_2.27_fix-1.patch &&
+    <para>
+      First, adapt Pulseaudio to upstream ALSA API changes:
+    </para>
+    <!-- This is due to it becoming FATAL to include ALSA headers from
+         /usr/include instead of /usr/include/alsa. Only one of these
+         files uses pkg-config to get it's headers, and as a result,
+         the hardcoded paths need to be updated. In this case, I developed
+         three seds and a call to ./bootstrap.sh to fix this. Other packages
+         may be affected by this upstream ALSA change as well. -->
+
+<screen><userinput>sed -i "s:asoundlib.h:alsa/asoundlib.h:" src/modules/alsa/*.{c,h} &&
+sed -i "s:use-case.h:alsa/use-case.h:" configure.ac &&
+sed -i "s:use-case.h:alsa/use-case.h:" src/modules/alsa/alsa-ucm.h</userinput></screen>
 
-AUTOPOINT='intltoolize \-\-automake \-\-copy' autoreconf -fiv &&-->
-<screen><userinput>./configure --prefix=/usr        \
+<screen><userinput>NOCONFIGURE=1 ./bootstrap.sh     &&
+./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --disable-bluez4     \


More information about the blfs-book mailing list