From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Sun, 24 Jan 2021 18:01:39 +0000 (+0000)
Subject: This is 3.3.8rc3
X-Git-Tag: 4.0-dev~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106d0b327aa1c65b7c08e53ff31842d88eaf07cb;p=thirdparty%2Fshairport-sync.git

This is 3.3.8rc3
---

diff --git a/configure.ac b/configure.ac
index 341bb389..62a37e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 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
 AC_CONFIG_SRCDIR([shairport.c])
 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
   AC_DEFINE([CONFIG_APPLE_ALAC], 1, [Include support for using the Apple ALAC Decoder])
   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
-    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
 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)])
 elif test "x${with_ssl}" = xpolarssl ; then
 	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
 	AC_MSG_ERROR(specify one of --with-ssl=openssl or --with-ssl=mbedtls or --with-ssl=polarssl)
 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])])
 if test "x$with_dns_sd" = "xyes" ; then
   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
 AM_CONDITIONAL([USE_DNS_SD], [test "x$with_dns_sd" = "xyes"])
 
diff --git a/shairport-sync.spec b/shairport-sync.spec
index 7755c8fe..215b303c 100644
--- a/shairport-sync.spec
+++ b/shairport-sync.spec
@@ -1,5 +1,5 @@
 Name:           shairport-sync
-Version:        3.3.5
+Version:        3.3.7
 Release:        1%{?dist}
 Summary:        AirTunes emulator. Multi-Room with Audio Synchronisation
 # MIT licensed except for tinysvcmdns under BSD, 
@@ -66,6 +66,8 @@ getent passwd %{name} &> /dev/null || useradd --system -c "%{name} User" \
 %license LICENSES
 
 %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
 - 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
diff --git a/shairport.c b/shairport.c
index ba995233..a32216d3 100644
--- a/shairport.c
+++ b/shairport.c
@@ -1322,7 +1322,7 @@ void exit_function() {
 #ifdef CONFIG_LIBDAEMON
     if ((this_is_the_daemon_process) ||
         (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
       debug(2, "exit function called...");
       /*
@@ -1617,7 +1617,7 @@ int main(int argc, char **argv) {
         debug(2, "killed the %s daemon.", config.appName);
       else
         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);
     }
     return ret < 0 ? 1 : 0;
diff --git a/tests/configure_test.sh b/tests/configure_test.sh
index f1dccf9c..a3747796 100644
--- a/tests/configure_test.sh
+++ b/tests/configure_test.sh
@@ -6,13 +6,18 @@
 # If doesn't check for the presence or absence of products except
 # 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.
 check_configuration_string_includes()
 {
 	echo -n " checking configuration string includes \"$1\"..."
 	./shairport-sync -V | grep -q $1
 	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
 	fi
 	echo -n "ok"
@@ -23,7 +28,7 @@ check_configuration_string_excludes()
 	echo -n " checking configuration string excludes \"$1\"..."
 	./shairport-sync -V | grep -q $1
 	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
 	fi
 	echo -n "ok"
@@ -63,12 +68,12 @@ check_for_success()
 			echo "make -j $((`nproc`*2))" >> $LOGFILE
 			make -j $((`nproc`*2)) >> $LOGFILE 2>&1
 			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
 			fi
 			echo -n "ok"
 		else
-			echo "\nError at configure step with arg \"$A2\"."
+			echo "\nError at configure step with arg \"$A2\". See \"../configure_test.log\"."
 			exit 1
 		fi
 		if [ "$A4" != "" ] ; then
@@ -88,7 +93,7 @@ check_for_configuration_fail()
 		TESTCOUNT="$(expr "$TESTCOUNT" '+' '1')"
 		./configure $3 $2 > $LOGFILE 2>&1
 		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
 		fi
 		echo " done."
@@ -102,7 +107,7 @@ CWD=`pwd`
 cd ..
 autoreconf -fi > $LOGFILE 2>&1
 if [ "$?" -ne "0" ] ; then
-	echo "\Error running \"autoreconf -fi\""
+	echo " error running \"autoreconf -fi\" -- see \"../configure_test.log\"."
 	exit 1
 fi
 echo "ok."
@@ -198,4 +203,5 @@ check_for_success x$1 --with-systemv '--sysconfdir=/etc --with-libdaemon --with-
 check_for_success x$1 --without-systemv '--sysconfdir=/etc --with-libdaemon --with-alsa --with-soxr --with-avahi --with-ssl=openssl' OpenSSL-Avahi-ALSA-soxr-sysconfdir:/etc
 
 cd $CWD
-echo "$TESTCOUNT tests completed."
\ No newline at end of file
+echo "$TESTCOUNT tests completed."
+