From 7c894ab7ad0a79602fb4215cd0a66ba3c6731337 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 2 Feb 2025 19:09:16 +0100
Subject: [PATCH] axfer, topology: use only <alsa/asoundlib.h> include instead
 specific alsa-lib headers

See commit ea8972c8 ("include: prefer alsa/asoundlib.h for apps, dependency cleanups")
in alsa-lib.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 axfer/waiter.h                          | 2 +-
 configure.ac                            | 2 +-
 topology/nhlt/intel/dmic-nhlt.c         | 6 +-----
 topology/nhlt/intel/dmic/dmic-debug.c   | 2 +-
 topology/nhlt/intel/dmic/dmic-process.c | 5 +----
 topology/nhlt/intel/intel-nhlt.h        | 5 +----
 topology/nhlt/intel/ssp-nhlt.c          | 5 +----
 topology/nhlt/intel/ssp/ssp-debug.c     | 2 +-
 topology/nhlt/intel/ssp/ssp-process.c   | 6 +-----
 topology/nhlt/nhlt-processor.c          | 6 +-----
 10 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/axfer/waiter.h b/axfer/waiter.h
index 0f4e9b9..6c4f4cb 100644
--- a/axfer/waiter.h
+++ b/axfer/waiter.h
@@ -9,7 +9,7 @@
 #ifndef __ALSA_UTILS_AXFER_WAITER__H_
 #define __ALSA_UTILS_AXFER_WAITER__H_
 
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include <poll.h>
 
 enum waiter_type {
diff --git a/configure.ac b/configure.ac
index 5624add..be627bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE([enable])
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.22.5])
 
 dnl Checks for programs.
 
diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c
index de659cf..7c98a3b 100644
--- a/topology/nhlt/intel/dmic-nhlt.c
+++ b/topology/nhlt/intel/dmic-nhlt.c
@@ -10,11 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "dmic-nhlt.h"
 #include "dmic/dmic-process.h"
 
diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c
index a977c93..82c6113 100644
--- a/topology/nhlt/intel/dmic/dmic-debug.c
+++ b/topology/nhlt/intel/dmic/dmic-debug.c
@@ -8,7 +8,7 @@
 #include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include "dmic-debug.h"
 
 #ifdef NHLT_DEBUG
diff --git a/topology/nhlt/intel/dmic/dmic-process.c b/topology/nhlt/intel/dmic/dmic-process.c
index adbec79..b9395cf 100644
--- a/topology/nhlt/intel/dmic/dmic-process.c
+++ b/topology/nhlt/intel/dmic/dmic-process.c
@@ -11,10 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "../intel-nhlt.h"
 #include "dmic-process.h"
 #include "dmic-internal.h"
diff --git a/topology/nhlt/intel/intel-nhlt.h b/topology/nhlt/intel/intel-nhlt.h
index 72e61fb..657b538 100644
--- a/topology/nhlt/intel/intel-nhlt.h
+++ b/topology/nhlt/intel/intel-nhlt.h
@@ -12,10 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 
 #define MIN(a, b) ({		\
 	typeof(a) __a = (a);	\
diff --git a/topology/nhlt/intel/ssp-nhlt.c b/topology/nhlt/intel/ssp-nhlt.c
index 1137819..168e6bc 100644
--- a/topology/nhlt/intel/ssp-nhlt.c
+++ b/topology/nhlt/intel/ssp-nhlt.c
@@ -10,10 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "intel-nhlt.h"
 #include "ssp-nhlt.h"
 #include "ssp/ssp-process.h"
diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c
index 154c83a..afb8ac2 100644
--- a/topology/nhlt/intel/ssp/ssp-debug.c
+++ b/topology/nhlt/intel/ssp/ssp-debug.c
@@ -7,7 +7,7 @@
 #include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include "ssp-debug.h"
 #include "../intel-nhlt.h"
 
diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c
index 3a1db9f..bffbc5a 100644
--- a/topology/nhlt/intel/ssp/ssp-process.c
+++ b/topology/nhlt/intel/ssp/ssp-process.c
@@ -14,11 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "../intel-nhlt.h"
 #include "../../nhlt.h"
 #include "ssp-process.h"
diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c
index ca539c3..8197201 100644
--- a/topology/nhlt/nhlt-processor.c
+++ b/topology/nhlt/nhlt-processor.c
@@ -11,11 +11,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <inttypes.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "pre-process-external.h"
 #include "nhlt.h"
 #include "intel/intel-nhlt.h"
-- 
2.47.1