nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is 3.3.8rc3

Browse Source
This commit is contained in:
Mike Brady
2021-01-24 18:01:39 +00:00
parent 4f3a1e65d1
commit 106d0b327a
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+5 -5
View File
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.50]) AC_PREREQ([2.50])
AC_INIT([shairport-sync], [3.3.8d4], [4265913+mikebrady@users.noreply.github.com]) AC_INIT([shairport-sync], [3.3.8d5], [4265913+mikebrady@users.noreply.github.com])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([shairport.c]) AC_CONFIG_SRCDIR([shairport.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@@ -124,9 +124,9 @@ AC_ARG_WITH(apple-alac,[AS_HELP_STRING([--with-apple-alac],[include support for
if test "x${with_apple_alac}" = "xyes" ; then if test "x${with_apple_alac}" = "xyes" ; then
AC_DEFINE([CONFIG_APPLE_ALAC], 1, [Include support for using the Apple ALAC Decoder]) AC_DEFINE([CONFIG_APPLE_ALAC], 1, [Include support for using the Apple ALAC Decoder])
if test "x${with_pkg_config}" = xyes ; then if test "x${with_pkg_config}" = xyes ; then
PKG_CHECK_MODULES([alac], [alac], [LIBS="${alac_LIBS} ${LIBS}"], AC_MSG_ERROR(Apple ALAC Decoder support requires the ALAC library.)) PKG_CHECK_MODULES([alac], [alac], [LIBS="${alac_LIBS} ${LIBS}"], AC_MSG_ERROR(Apple ALAC Decoder support requires the ALAC library. See https://github.com/mikebrady/alac.))
else else
AC_CHECK_LIB([alac], [BitBufferInit], , AC_MSG_ERROR(Apple ALAC Decoder support requires the ALAC library.)) AC_CHECK_LIB([alac], [BitBufferInit], , AC_MSG_ERROR(Apple ALAC Decoder support requires the ALAC library. See https://github.com/mikebrady/alac.))
fi fi
fi fi
AM_CONDITIONAL([USE_APPLE_ALAC], [test "x${with_apple_alac}" = "xyes"]) AM_CONDITIONAL([USE_APPLE_ALAC], [test "x${with_apple_alac}" = "xyes"])
@@ -182,7 +182,7 @@ elif test "x${with_ssl}" = xmbedtls ; then
[AC_MSG_ERROR([mbed tls support requires the mbedx509 library -- libmbedx509-0 suggested],1)]) [AC_MSG_ERROR([mbed tls support requires the mbedx509 library -- libmbedx509-0 suggested],1)])
elif test "x${with_ssl}" = xpolarssl ; then elif test "x${with_ssl}" = xpolarssl ; then
AC_DEFINE([CONFIG_POLARSSL], 1, [Use the PolarSSL libraries for encryption and encoding and decoding]) AC_DEFINE([CONFIG_POLARSSL], 1, [Use the PolarSSL libraries for encryption and encoding and decoding])
AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL is selected but the library cannot be found and is deprecated. Consider selecting mbed TLS instead using --with-ssl=mbedtls.)) AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL is selected but the library libpolarssl-dev does not seem to be installed and is deprecated. Consider selecting mbedtls instead using --with-ssl=mbedtls.))
else else
AC_MSG_ERROR(specify one of --with-ssl=openssl or --with-ssl=mbedtls or --with-ssl=polarssl) AC_MSG_ERROR(specify one of --with-ssl=openssl or --with-ssl=mbedtls or --with-ssl=polarssl)
fi fi
@@ -311,7 +311,7 @@ AM_CONDITIONAL([USE_CONVOLUTION], [test "x$with_convolution" = "xyes"])
AC_ARG_WITH(dns_sd, [AS_HELP_STRING([--with-dns_sd],[choose dns_sd mDNS support])]) AC_ARG_WITH(dns_sd, [AS_HELP_STRING([--with-dns_sd],[choose dns_sd mDNS support])])
if test "x$with_dns_sd" = "xyes" ; then if test "x$with_dns_sd" = "xyes" ; then
AC_DEFINE([CONFIG_DNS_SD], 1, [Include dns_sd mDNS support.]) AC_DEFINE([CONFIG_DNS_SD], 1, [Include dns_sd mDNS support.])
AC_SEARCH_LIBS([DNSServiceRefDeallocate], [dns_sd], , [AC_MSG_ERROR(dns_sd support requires the dns_sd library!)]) AC_SEARCH_LIBS([DNSServiceRefDeallocate], [dns_sd], , [AC_MSG_ERROR(dns_sd support requires the dns_sd library. Originally in Apple's mDNSResponder but also in libavahi-compat-libdnssd-dev.)])
fi fi
AM_CONDITIONAL([USE_DNS_SD], [test "x$with_dns_sd" = "xyes"]) AM_CONDITIONAL([USE_DNS_SD], [test "x$with_dns_sd" = "xyes"])
shairport-sync.spec
+3 -1
View File
@@ -1,5 +1,5 @@
Name: shairport-sync Name: shairport-sync
Version: 3.3.5 Version: 3.3.7
Release: 1%{?dist} Release: 1%{?dist}
Summary: AirTunes emulator. Multi-Room with Audio Synchronisation Summary: AirTunes emulator. Multi-Room with Audio Synchronisation
# MIT licensed except for tinysvcmdns under BSD, # MIT licensed except for tinysvcmdns under BSD,
@@ -66,6 +66,8 @@ getent passwd %{name} &> /dev/null || useradd --system -c "%{name} User" \
%license LICENSES %license LICENSES
%changelog %changelog
* Tue Nov 1 2020 Mike Brady <mikebradydublin@icloud.com) 3.3.7
- Jack resampling, bug fixes and additions to the pipe and stdout backends, to metadata and to the D-Bus and MPRIS interfaces.
* Thu Feb 20 2020 Mike Brady <mikebradydublin@icloud.com) 3.3.6 * Thu Feb 20 2020 Mike Brady <mikebradydublin@icloud.com) 3.3.6
- Jack resampling, bug fixes and additions to the D-Bus and MPRIS interfaces. - Jack resampling, bug fixes and additions to the D-Bus and MPRIS interfaces.
* Wed Nov 13 2019 Mike Brady <mikebrady@eircom.net) 3.3.5 * Wed Nov 13 2019 Mike Brady <mikebrady@eircom.net) 3.3.5
shairport.c
+2 -2
View File
@@ -1322,7 +1322,7 @@ void exit_function() {
#ifdef CONFIG_LIBDAEMON #ifdef CONFIG_LIBDAEMON
if ((this_is_the_daemon_process) || if ((this_is_the_daemon_process) ||
(config.daemonise == 0)) { // if this is the daemon process that is exiting or it's not (config.daemonise == 0)) { // if this is the daemon process that is exiting or it's not
// actually deamonised at all // actually daemonised at all
#endif #endif
debug(2, "exit function called..."); debug(2, "exit function called...");
/* /*
@@ -1617,7 +1617,7 @@ int main(int argc, char **argv) {
debug(2, "killed the %s daemon.", config.appName); debug(2, "killed the %s daemon.", config.appName);
else else
daemon_log(LOG_WARNING, daemon_log(LOG_WARNING,
"killed the %s deamon, but cannot remove old PID file: \"%s\", errno %u.", "killed the %s daemon, but cannot remove old PID file: \"%s\", errno %u.",
config.appName, strerror(errno), errno); config.appName, strerror(errno), errno);
} }
return ret < 0 ? 1 : 0; return ret < 0 ? 1 : 0;
tests/configure_test.sh
+12 -6
View File
@@ -6,13 +6,18 @@
# If doesn't check for the presence or absence of products except # If doesn't check for the presence or absence of products except
# when it checks for the configuration string # when it checks for the configuration string
# To get it to work first time, and assuming you have already build Shairport Sync according to the standard
# you need the following extra libraries in Linux:
# libmbedtls-dev libpolarssl-dev libjack-dev libsndio-dev libao-dev libpulse-dev libsndfile1-dev libavahi-compat-libdnssd-dev libglib2.0-dev libmosquitto-dev
# Also, you'll need to build the ALAC library -- see https://github.com/mikebrady/alac.
# At present, it is Linux-only. # At present, it is Linux-only.
check_configuration_string_includes() check_configuration_string_includes()
{ {
echo -n " checking configuration string includes \"$1\"..." echo -n " checking configuration string includes \"$1\"..."
./shairport-sync -V | grep -q $1 ./shairport-sync -V | grep -q $1
if [ "$?" -eq "1" ] ; then if [ "$?" -eq "1" ] ; then
echo "\nError: \"$1\" not included in configuration string" echo "\nError: \"$1\" not included in configuration string. See \"../configure_test.log\"."
exit 1 exit 1
fi fi
echo -n "ok" echo -n "ok"
@@ -23,7 +28,7 @@ check_configuration_string_excludes()
echo -n " checking configuration string excludes \"$1\"..." echo -n " checking configuration string excludes \"$1\"..."
./shairport-sync -V | grep -q $1 ./shairport-sync -V | grep -q $1
if [ "$?" -eq "0" ] ; then if [ "$?" -eq "0" ] ; then
echo "\nError: \"$1\" is unexpectedly included in the configuration string" echo "\nError: \"$1\" is unexpectedly included in the configuration string. See \"../configure_test.log\"."
exit 1 exit 1
fi fi
echo -n "ok" echo -n "ok"
@@ -63,12 +68,12 @@ check_for_success()
echo "make -j $((`nproc`*2))" >> $LOGFILE echo "make -j $((`nproc`*2))" >> $LOGFILE
make -j $((`nproc`*2)) >> $LOGFILE 2>&1 make -j $((`nproc`*2)) >> $LOGFILE 2>&1
if [ "$?" -ne "0" ] ; then if [ "$?" -ne "0" ] ; then
echo "\nError at build step with arg \"$A2\"." echo "\nError at build step with arg \"$A2\". See \"../configure_test.log\"."
exit 1 exit 1
fi fi
echo -n "ok" echo -n "ok"
else else
echo "\nError at configure step with arg \"$A2\"." echo "\nError at configure step with arg \"$A2\". See \"../configure_test.log\"."
exit 1 exit 1
fi fi
if [ "$A4" != "" ] ; then if [ "$A4" != "" ] ; then
@@ -88,7 +93,7 @@ check_for_configuration_fail()
TESTCOUNT="$(expr "$TESTCOUNT" '+' '1')" TESTCOUNT="$(expr "$TESTCOUNT" '+' '1')"
./configure $3 $2 > $LOGFILE 2>&1 ./configure $3 $2 > $LOGFILE 2>&1
if [ "$?" -eq "0" ] ; then if [ "$?" -eq "0" ] ; then
echo "\nError: configuration did not fail with arg \"$2\"." echo "\nError: configuration did not fail with arg \"$2\". See \"../configure_test.log\"."
exit 1 exit 1
fi fi
echo " done." echo " done."
@@ -102,7 +107,7 @@ CWD=`pwd`
cd .. cd ..
autoreconf -fi > $LOGFILE 2>&1 autoreconf -fi > $LOGFILE 2>&1
if [ "$?" -ne "0" ] ; then if [ "$?" -ne "0" ] ; then
echo "\Error running \"autoreconf -fi\"" echo " error running \"autoreconf -fi\" -- see \"../configure_test.log\"."
exit 1 exit 1
fi fi
echo "ok." echo "ok."
@@ -199,3 +204,4 @@ check_for_success x$1 --without-systemv '--sysconfdir=/etc --with-libdaemon --wi
cd $CWD cd $CWD
echo "$TESTCOUNT tests completed." echo "$TESTCOUNT tests completed."