From 0a6832217044074c43ec652219492c3e7793c3ba Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 1 Mar 2021 15:11:50 +0300
Subject: [PATCH] add missing PIPEWIRE defines to SDL_config.h.in
also specify 'audio' in Pipepire configuration enable messages.
---
CMakeLists.txt | 2 +-
configure | 6 +++---
configure.ac | 2 +-
include/SDL_config.h.in | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b511291d..e1a4ad153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,7 +360,7 @@ set_option(JACK "Support the JACK audio API" ${UNIX_SYS})
dep_option(JACK_SHARED "Dynamically load JACK audio support" ON "JACK" OFF)
set_option(ESD "Support the Enlightened Sound Daemon" ${UNIX_SYS})
dep_option(ESD_SHARED "Dynamically load ESD audio support" ON "ESD" OFF)
-set_option(PIPEWIRE "Use Pipewire" ${UNIX_SYS})
+set_option(PIPEWIRE "Use Pipewire audio" ${UNIX_SYS})
dep_option(PIPEWIRE_SHARED "Dynamically load Pipewire support" ON "PIPEWIRE" OFF)
set_option(PULSEAUDIO "Use PulseAudio" ${UNIX_SYS})
dep_option(PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "PULSEAUDIO" OFF)
diff --git a/configure b/configure
index 5b2204df3..4d0dae7f8 100755
--- a/configure
+++ b/configure
@@ -676,10 +676,10 @@ RPI_CFLAGS
FUSIONSOUND_LIBS
FUSIONSOUND_CFLAGS
ARTSCONFIG
-PIPEWIRE_LIBS
-PIPEWIRE_CFLAGS
PULSEAUDIO_LIBS
PULSEAUDIO_CFLAGS
+PIPEWIRE_LIBS
+PIPEWIRE_CFLAGS
ESD_LIBS
ESD_CFLAGS
ESD_CONFIG
@@ -1611,7 +1611,7 @@ Optional Features:
--enable-esd support the Enlightened Sound Daemon [[default=yes]]
--disable-esdtest Do not try to compile and run a test ESD program
--enable-esd-shared dynamically load ESD audio support [[default=yes]]
- --enable-pipewire use Pipewire [[default=yes]]
+ --enable-pipewire use Pipewire audio [[default=yes]]
--enable-pipewire-shared
dynamically load Pipewire support [[default=yes]]
--enable-pulseaudio use PulseAudio [[default=yes]]
diff --git a/configure.ac b/configure.ac
index 09c7ce423..15140c3fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1021,7 +1021,7 @@ dnl Find Pipewire
CheckPipewire()
{
AC_ARG_ENABLE(pipewire,
-AS_HELP_STRING([--enable-pipewire], [use Pipewire [[default=yes]]]),
+AS_HELP_STRING([--enable-pipewire], [use Pipewire audio [[default=yes]]]),
, enable_pipewire=yes)
if test x$enable_audio = xyes -a x$enable_pipewire = xyes; then
PKG_CHECK_MODULES([PIPEWIRE], [libpipewire-0.3 >= 0.3.20], audio_pipewire=yes, audio_pipewire=no)
diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
index 4deee1ad5..9ddd932e3 100644
--- a/include/SDL_config.h.in
+++ b/include/SDL_config.h.in
@@ -284,6 +284,8 @@
#undef SDL_AUDIO_DRIVER_OSS
#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
#undef SDL_AUDIO_DRIVER_PAUDIO
+#undef SDL_AUDIO_DRIVER_PIPEWIRE
+#undef SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC
#undef SDL_AUDIO_DRIVER_PULSEAUDIO
#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
#undef SDL_AUDIO_DRIVER_QSA