geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add missing PIPEWIRE defines to SDL_config.h.in 

also specify 'audio' in Pipepire configuration enable messages.
main
Ozkan Sezer 2021-03-01 15:11:50 +03:00
parent 7001b531c6
commit 0a68322170
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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) dep_option(JACK_SHARED "Dynamically load JACK audio support" ON "JACK" OFF)
set_option(ESD "Support the Enlightened Sound Daemon" ${UNIX_SYS}) set_option(ESD "Support the Enlightened Sound Daemon" ${UNIX_SYS})
dep_option(ESD_SHARED "Dynamically load ESD audio support" ON "ESD" OFF) 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) dep_option(PIPEWIRE_SHARED "Dynamically load Pipewire support" ON "PIPEWIRE" OFF)
set_option(PULSEAUDIO "Use PulseAudio" ${UNIX_SYS}) set_option(PULSEAUDIO "Use PulseAudio" ${UNIX_SYS})
dep_option(PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "PULSEAUDIO" OFF) dep_option(PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "PULSEAUDIO" OFF)

6
configure vendored
View File

@ -676,10 +676,10 @@ RPI_CFLAGS
FUSIONSOUND_LIBS FUSIONSOUND_LIBS
FUSIONSOUND_CFLAGS FUSIONSOUND_CFLAGS
ARTSCONFIG ARTSCONFIG
PIPEWIRE_LIBS
PIPEWIRE_CFLAGS
PULSEAUDIO_LIBS PULSEAUDIO_LIBS
PULSEAUDIO_CFLAGS PULSEAUDIO_CFLAGS
PIPEWIRE_LIBS
PIPEWIRE_CFLAGS
ESD_LIBS ESD_LIBS
ESD_CFLAGS ESD_CFLAGS
ESD_CONFIG ESD_CONFIG
@ -1611,7 +1611,7 @@ Optional Features:
--enable-esd support the Enlightened Sound Daemon [[default=yes]] --enable-esd support the Enlightened Sound Daemon [[default=yes]]
--disable-esdtest Do not try to compile and run a test ESD program --disable-esdtest Do not try to compile and run a test ESD program
--enable-esd-shared dynamically load ESD audio support [[default=yes]] --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 --enable-pipewire-shared
dynamically load Pipewire support [[default=yes]] dynamically load Pipewire support [[default=yes]]
--enable-pulseaudio use PulseAudio [[default=yes]] --enable-pulseaudio use PulseAudio [[default=yes]]

2
configure.ac
View File

@ -1021,7 +1021,7 @@ dnl Find Pipewire
CheckPipewire() CheckPipewire()
{ {
AC_ARG_ENABLE(pipewire, 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) , enable_pipewire=yes)
if test x$enable_audio = xyes -a x$enable_pipewire = xyes; then 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) PKG_CHECK_MODULES([PIPEWIRE], [libpipewire-0.3 >= 0.3.20], audio_pipewire=yes, audio_pipewire=no)

2
include/SDL_config.h.in
View File

@ -284,6 +284,8 @@
#undef SDL_AUDIO_DRIVER_OSS #undef SDL_AUDIO_DRIVER_OSS
#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
#undef SDL_AUDIO_DRIVER_PAUDIO #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
#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
#undef SDL_AUDIO_DRIVER_QSA #undef SDL_AUDIO_DRIVER_QSA