[1/1] package/shairport-sync: fix patch fuzz
diff mbox series

Message ID 20240707134840.4130434-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/1] package/shairport-sync: fix patch fuzz
Related show

Commit Message

Dario Binacchi July 7, 2024, 1:48 p.m. UTC 
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, shairport-sync fails to build with output:

    Applying 0001-configure.ac-find-sndfile-through-pkg-config.patch using patch:
    patching file configure.ac
    Hunk #1 FAILED at 304.
    1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .checkpackageignore                                       | 1 -
 ...001-configure.ac-find-sndfile-through-pkg-config.patch | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

'Jan Kiszka' via Amarula Linux July 8, 2024, 9:09 p.m. UTC | #1 
On Sun,  7 Jul 2024 15:48:40 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, shairport-sync fails to build with output:
> 
>     Applying 0001-configure.ac-find-sndfile-through-pkg-config.patch using patch:
>     patching file configure.ac
>     Hunk #1 FAILED at 304.
>     1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  .checkpackageignore                                       | 1 -
>  ...001-configure.ac-find-sndfile-through-pkg-config.patch | 8 +++++---
>  2 files changed, 5 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Patch
diff mbox series 

diff --git a/.checkpackageignore b/.checkpackageignore
index 0a1d2627455e..6b489fe12924 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1359,7 +1359,6 @@  package/setserial/0002-tiocghayesesp-build-fix.patch lib_patch.Upstream
 package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch lib_patch.Upstream
 package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch lib_patch.Upstream
 package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch lib_patch.Upstream
-package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch lib_patch.Upstream
 package/shairport-sync/S99shairport-sync Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch lib_patch.Upstream
 package/shellinabox/0001-Makefile-disable-always-building-statically.patch lib_patch.Upstream
diff --git a/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
index bd97ec0c3d8f..b593703a2a69 100644
--- a/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
+++ b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
@@ -13,7 +13,9 @@  Fixes:
  - http://autobuild.buildroot.org/results/92ed30a6855ca11800b779718822bcba4a69c9a3
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1263]
+Upstream: https://github.com/mikebrady/shairport-sync/pull/1263
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  configure.ac | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
@@ -22,9 +24,9 @@  diff --git a/configure.ac b/configure.ac
 index f77087c5..9b982c51 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -304,7 +304,14 @@ AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP
+@@ -303,7 +303,14 @@
+ 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!))
 +  if  test "x${with_pkg_config}" = xyes ; then