Changeset dc2615fa

Timestamp:

05/25/2019 04:22:40 AM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.0, 9.1, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4ef9eb3

Parents:

6d78663

Message:

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.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21624 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/pulseaudio.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <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>

multimedia/libdriv/pulseaudio.xml

@@ -139 +139 @@
     </para>
 
-<!--<screen><userinput>patch -Np1 -i ../pulseaudio-&pulseaudio-version;-glibc_2.27_fix-1.patch &amp;&amp;
-
-AUTOPOINT='intltoolize \-\-automake \-\-copy' autoreconf -fiv &amp;&amp;-->
-<screen><userinput>./configure --prefix=/usr        \
+    <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} &amp;&amp;
+sed -i "s:use-case.h:alsa/use-case.h:" configure.ac &amp;&amp;
+sed -i "s:use-case.h:alsa/use-case.h:" src/modules/alsa/alsa-ucm.h</userinput></screen>
+
+<screen><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
+./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \