Changeset 4d390d2 for multimedia/libdriv/pulseaudio.xml

Timestamp:

05/25/2019 03:31:11 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

cbf7be5

Parents:

8eebfaa5

Message:

Merge to HEAD 21624.

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

File:

• multimedia/libdriv/pulseaudio.xml (modified) (2 diffs)

multimedia/libdriv/pulseaudio.xml

@@ -128 +128 @@
     </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 revision="sysv"><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 revision="sysv"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
+./configure --prefix=/usr                \
             --sysconfdir=/etc            \
             --localstatedir=/var         \
@@ -141 +152 @@
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr        \
+<screen revision="systemd"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
+./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \