diff options
| author | Chris Boot <bootc@boo.tc> | 2021-11-13 17:10:31 +0000 |
|---|---|---|
| committer | Chris Boot <bootc@boo.tc> | 2021-11-13 17:23:21 +0000 |
| commit | 72b2979583b0c95488ec4663eb625aaea118b30c (patch) | |
| tree | b281a72488cd6d76bf6e9c19821dff5c21b17f88 | |
| parent | 5ea7d2737aa1fbd1ea91f4cd347cb3b85a2eaf58 (diff) | |
d/patches/github-1314.patch: fix build with automake 1.16.5
Closes: #998502
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/github-1314.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 47 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5dd43f9..81d0b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ shairport-sync (3.3.8-1) UNRELEASED; urgency=medium * New upstream release. - d/patches/typo-fixes.patch: remove; included upstream. + * d/patches/github-1314.patch: fix build with automake 1.16.5. + (Closes: #998502) -- Chris Boot <bootc@debian.org> Sat, 13 Nov 2021 17:15:16 +0000 diff --git a/debian/patches/github-1314.patch b/debian/patches/github-1314.patch new file mode 100644 index 0000000..3db16fb --- /dev/null +++ b/debian/patches/github-1314.patch @@ -0,0 +1,44 @@ +From 424cc398240c18e95c26edda1dd565c5915e4c1c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 15 Oct 2021 08:20:12 +0200 +Subject: [PATCH] configure.ac: fix build with automake 1.16.5 +Origin: https://github.com/mikebrady/shairport-sync/pull/1314 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=998502 + +Fix the following build failure with convolution raised since automake +1.16.5 and +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624: + +configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:6: the top level +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:305: the top level + +Fixes: + - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.50]) + AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady@users.noreply.github.com]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([subdir-objects]) + AC_CONFIG_SRCDIR([shairport.c]) + AC_CONFIG_HEADERS([config.h]) + AC_PROG_RANLIB +@@ -302,7 +302,6 @@ + # Look for Convolution flag + AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) + if test "x$with_convolution" = "xyes" ; then +- AM_INIT_AUTOMAKE([subdir-objects]) + AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) + AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) + fi diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..48e8e1a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +github-1314.patch |