From e6f6aaade008f4fdb52ecae20a07be632fd52702 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 21 Nov 2023 11:05:11 -0500 Subject: [PATCH] 2023-11-21 Fred Gleason * Fixed a regression in the build system that caused configuration to halt if JACK support was not detected. * Fixed a regression in build system that caused configuration to halt if ALSA support was not detected. * Fixed a regression in caed(8) that caused the build to fail if HPI support was not enabled. * Fixed a regression in caed(8) that caused the build to fail if ALSA support was not enabled. Signed-off-by: Fred Gleason --- ChangeLog | 9 +++++++++ cae/driver_alsa.cpp | 8 ++++++++ cae/driver_hpi.cpp | 8 ++++++++ configure.ac | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fec13c5..90aa427a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24484,3 +24484,12 @@ harness. 2023-11-20 Fred Gleason * Incremented the package version to 4.1.1. +2023-11-21 Fred Gleason + * Fixed a regression in the build system that caused configuration + to halt if JACK support was not detected. + * Fixed a regression in build system that caused configuration + to halt if ALSA support was not detected. + * Fixed a regression in caed(8) that caused the build to fail + if HPI support was not enabled. + * Fixed a regression in caed(8) that caused the build to fail + if ALSA support was not enabled. diff --git a/cae/driver_alsa.cpp b/cae/driver_alsa.cpp index 2c0e3b7b..dffac84d 100644 --- a/cae/driver_alsa.cpp +++ b/cae/driver_alsa.cpp @@ -735,13 +735,21 @@ bool DriverAlsa::initialize(unsigned *next_cardnum) int DriverAlsa::inputPortQuantity(int card) const { +#ifdef ALSA return alsa_input_port_quantities.value(card); +#else + return 0; +#endif // ALSA } int DriverAlsa::outputPortQuantity(int card) const { +#ifdef ALSA return alsa_output_port_quantities.value(card); +#else + return 0; +#endif // ALSA } diff --git a/cae/driver_hpi.cpp b/cae/driver_hpi.cpp index 1ad27366..c3a68df0 100644 --- a/cae/driver_hpi.cpp +++ b/cae/driver_hpi.cpp @@ -93,13 +93,21 @@ bool DriverHpi::initialize(unsigned *next_cardnum) int DriverHpi::inputPortQuantity(int card) const { +#ifdef HPI return d_sound_card->getCardInputPorts(card); +#else + return 0; +#endif // HPI } int DriverHpi::outputPortQuantity(int card) const { +#ifdef HPI return d_sound_card->getCardOutputPorts(card); +#else + return 0; +#endif // HPI } diff --git a/configure.ac b/configure.ac index 92157ce5..e92fb7c7 100644 --- a/configure.ac +++ b/configure.ac @@ -452,8 +452,8 @@ fi # Setup Sound API Dependencies # AC_CHECK_HEADER(asihpi/hpi.h,[HPI_FOUND=yes],[]) -PKG_CHECK_MODULES(LIBJACK,jack,[JACK_FOUND=yes],[]) -PKG_CHECK_MODULES(ASOUNDLIB,alsa,[ALSA_FOUND=yes],[]) +PKG_CHECK_MODULES(LIBJACK,jack,[JACK_FOUND=yes],[JACK_NOT_FOUND=yes]) +PKG_CHECK_MODULES(ASOUNDLIB,alsa,[ALSA_FOUND=yes],[ALSA_NOT_FOUND=yes]) if test $HPI_FOUND ; then if test -z $HPI_DISABLED ; then USING_HPI=yes