diff -Nru alsa-tools-1.1.7/debian/changelog alsa-tools-1.1.7/debian/changelog --- alsa-tools-1.1.7/debian/changelog 2020-04-02 05:10:42.000000000 +0000 +++ alsa-tools-1.1.7/debian/changelog 2020-04-07 19:32:09.000000000 +0000 @@ -1,3 +1,10 @@ +alsa-tools (1.1.7-1ubuntu1~ppa2) focal; urgency=medium + + * Test Patch with upstream commit + Fix FTBFS - Use __u32 and __u64 for RMS array types + + -- Ross Gammon Tue, 07 Apr 2020 21:32:09 +0200 + alsa-tools (1.1.7-1ubuntu1~ppa1) focal; urgency=medium * Test Rebuild diff -Nru alsa-tools-1.1.7/debian/patches/hdspmixer-ftbfs.patch alsa-tools-1.1.7/debian/patches/hdspmixer-ftbfs.patch --- alsa-tools-1.1.7/debian/patches/hdspmixer-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-tools-1.1.7/debian/patches/hdspmixer-ftbfs.patch 2020-04-07 19:31:51.000000000 +0000 @@ -0,0 +1,25 @@ +Description: hdspmixer: Use __u32 and __u64 for RMS array types + Fix FTBFS by applying patch from upstream commit. FTBFS caused by Kernel + API change. + Some variable types are referring to the field in ioctl struct, which + are actually __u32 or __u64 instead of uint32_t or uint64_t. +Origin: https://git.alsa-project.org/?p=alsa-tools.git;a=commit;h=534e7fac808a891af0ccdd72c47cc9b1ccfde460 +Reviewed-by: Ross Gammon +Last-Update: 2020-04-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: alsa-tools-1.1.7/hdspmixer/src/HDSPMixerWindow.cxx +=================================================================== +--- alsa-tools-1.1.7.orig/hdspmixer/src/HDSPMixerWindow.cxx ++++ alsa-tools-1.1.7/hdspmixer/src/HDSPMixerWindow.cxx +@@ -35,8 +35,8 @@ static void readregisters_cb(void *arg) + hdsp_peak_rms_t hdsp_peak_rms; + struct hdspm_peak_rms hdspm_peak_rms; + bool isMADI = false; +- uint32_t *input_peaks, *playback_peaks, *output_peaks; +- uint64_t *input_rms, *playback_rms, *output_rms; ++ __u32 *input_peaks, *playback_peaks, *output_peaks; ++ __u64 *input_rms, *playback_rms, *output_rms; + + HDSPMixerWindow *w = (HDSPMixerWindow *)arg; + diff -Nru alsa-tools-1.1.7/debian/patches/series alsa-tools-1.1.7/debian/patches/series --- alsa-tools-1.1.7/debian/patches/series 2019-02-11 13:29:28.000000000 +0000 +++ alsa-tools-1.1.7/debian/patches/series 2020-04-07 19:21:38.000000000 +0000 @@ -3,3 +3,4 @@ envy24control_config_dir.patch spellfix-enought-to-enough.patch spellfix-occured-to-ocured.patch +hdspmixer-ftbfs.patch diff -Nru alsa-tools-1.1.7/debian/patches/spellfix-occured-to-ocured.patch alsa-tools-1.1.7/debian/patches/spellfix-occured-to-ocured.patch --- alsa-tools-1.1.7/debian/patches/spellfix-occured-to-ocured.patch 2019-02-11 13:29:28.000000000 +0000 +++ alsa-tools-1.1.7/debian/patches/spellfix-occured-to-ocured.patch 2020-04-07 19:19:53.000000000 +0000 @@ -7,10 +7,10 @@ as10k1/as10k1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/as10k1/as10k1.c b/as10k1/as10k1.c -index 96af0c3..48386d4 100644 ---- a/as10k1/as10k1.c -+++ b/as10k1/as10k1.c +Index: alsa-tools-1.1.7/as10k1/as10k1.c +=================================================================== +--- alsa-tools-1.1.7.orig/as10k1/as10k1.c ++++ alsa-tools-1.1.7/as10k1/as10k1.c @@ -266,7 +266,7 @@ void asm_open(char *name) } //get it's stats @@ -20,6 +20,3 @@ as_exit(""); } --- -2.11.0 -