From 858803f38e5e88391203de5246cf5ee2a73164bc Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Sat, 22 Feb 2020 20:37:01 +0000
Subject: [PATCH] alsa-tools: Fix the build of cspctl. ld10k1 will have to wait
 until after 9.1 is released (fixed as part of alsa-lib1.2.2 I think)

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

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index eadb224147..0a4bcf9dd4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
       </itemizedlist>
     </listitem>
        -->
+    <listitem>
+      <para>February 22nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix the build of cspctl in alsa-tools.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 21st, 2020</para>
       <itemizedlist>
diff --git a/multimedia/libdriv/alsa-tools.xml b/multimedia/libdriv/alsa-tools.xml
index 5d25547759..76e7105b36 100644
--- a/multimedia/libdriv/alsa-tools.xml
+++ b/multimedia/libdriv/alsa-tools.xml
@@ -111,7 +111,10 @@
 
     <!-- Re-evaluate this at the next alsa-lib release (or before freeze, 
          whichever comes first. ld10k1 and sb16_csp should be with 9.1. -->
-    <screen><userinput>rm -rf qlo10k1 Makefile gitcompile sb16_csp ld10k1</userinput></screen>
+    <!-- 9.1 renodr: sb16_csp fixed, ld10k1 is going to require a lot more work and
+         can be added as an errata. alsa-tools-1.2.2 and alsa-lib-1.2.2 should
+         do it.-->
+    <screen><userinput>rm -rf qlo10k1 Makefile gitcompile ld10k1</userinput></screen>
 
     <para>
       Next, adapt some of the <application>ALSA Tools</application> to
@@ -123,7 +126,8 @@
                              hdspmixer/src/*.cxx \
                              hdsploader/hdsploader.c &amp;&amp;
 sed -i -e '39 s/uint32_t/__u32/' hdspmixer/src/HDSPMixerWindow.cxx &amp;&amp;
-sed -i -e '40 s/uint64_t/__u64/' hdspmixer/src/HDSPMixerWindow.cxx</userinput></screen>
+sed -i -e '40 s/uint64_t/__u64/' hdspmixer/src/HDSPMixerWindow.cxx &amp;&amp;
+sed -i -e 's/snd_sb_csp_microcode_t/struct snd_sb_csp_microcode/' sb16_csp/cspctl.c</userinput></screen>
 
     <para>
       The <application>ALSA Tools</application> package is only needed by those