2023-11-21 Fred Gleason <fredg@paravelsystems.com>

* 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 <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-11-21 11:05:11 -05:00
parent 6065d117b1
commit e6f6aaade0
4 changed files with 27 additions and 2 deletions

View File

@@ -24484,3 +24484,12 @@
harness.
2023-11-20 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.1.1.
2023-11-21 Fred Gleason <fredg@paravelsystems.com>
* 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.

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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