From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Sat, 16 Sep 2023 17:20:12 +0000 (+0100)
Subject: Merge updates from the development branch into the master branch as 4.2.1
X-Git-Tag: 4.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12daaaf380cfd2c3d85003e78c0ac1dcabc2e6fb;p=thirdparty%2Fshairport-sync.git

Merge updates from the development branch into the master branch as 4.2.1
---

12daaaf380cfd2c3d85003e78c0ac1dcabc2e6fb
diff --cc README.md
index 4a2e068e,37992583..7e4ed475
--- a/README.md
+++ b/README.md
@@@ -13,7 -13,8 +13,8 @@@ Shairport Sync does not support AirPla
  * Next Steps and Advanced Topics are [here](ADVANCED%20TOPICS/README.md).
  * Runtime settings are documented [here](scripts/shairport-sync.conf).
  * Build configuration options are detailed in [CONFIGURATION FLAGS.md](CONFIGURATION%20FLAGS.md).
 -* The `man` page, detailing command line options, is [here](https://htmlpreview.github.io/?https://github.com/mikebrady/shairport-sync/blob/development/man/shairport-sync.html).
 +* The `man` page, detailing command line options, is [here](https://htmlpreview.github.io/?https://github.com/mikebrady/shairport-sync/blob/master/man/shairport-sync.html).
+ * Some advanced topics and developed in [ADVANCED TOPICS](https://github.com/mikebrady/shairport-sync/tree/master/ADVANCED%20TOPICS).
  
  # Features
  * Outputs AirPlay audio to [ALSA](https://www.alsa-project.org/wiki/Main_Page), [sndio](http://www.sndio.org), [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/), [Jack Audio](http://jackaudio.org), to a unix pipe or to `STDOUT`. It also has experimental support for [PipeWire](https://pipewire.org) and limited support for [libao](https://xiph.org/ao/) and for [libsoundio](http://libsound.io).
diff --cc configure.ac
index 7797c074,743b4743..4f38634b
--- a/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.50])
- AC_INIT([shairport-sync], [4.2], [4265913+mikebrady@users.noreply.github.com])
 -AC_INIT([shairport-sync], [4.2.1-dev], [4265913+mikebrady@users.noreply.github.com])
++AC_INIT([shairport-sync], [4.2.1], [4265913+mikebrady@users.noreply.github.com])
  AM_INIT_AUTOMAKE([subdir-objects])
  AC_CONFIG_SRCDIR([shairport.c])
  AC_CONFIG_HEADERS([config.h])