From patchwork Sun Jul 7 13:48:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3193 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B6F6243D73 for ; Sun, 7 Jul 2024 15:48:47 +0200 (CEST) Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-52ea49377b1sf2698818e87.0 for ; Sun, 07 Jul 2024 06:48:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720360127; cv=pass; d=google.com; s=arc-20160816; b=wj4XJuvAVE9js2pXFb1++sFfN84n6+VJPzagLFiUV3OyYKRBpJUmwMicVdj/tO4eGM lRdpET90cQopqvMC3SWGCEyPd89aE7BI6SQ+jU+wgyIuoQvJEaWgMEvYXxMAkvrSgDJi YgGMUFmhkPFY+xBcF9LR4iU6pWWqwtIAQaf5kxRl8K3on97gUay+LyoTv075pZNWC+gr 7qnKtlhAKNMV83oiCIHiZSyftCwV2WQdGtXycaH6KHtRXRo6IKAIokOELRHI2DnjSiiD 7QezbwduOBxBNKKcyZ+wzaaBFDCoaYENU+tS7bApYJ6TlgUFNlv7soPLk35nZAAKT90n hMww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=TlIeDL8GKxfHdH1Nat3u1/LAIKeplmkY9qaW2UKh5So=; fh=czmSw58VV1LbmTNQIXNGuSnvvHhB9jZK0mbLex58kwE=; b=BKIaFjoI/9uudVcyTEqB13f+UIt3lH94A2kKZDWiWutmI3c2df/9A5anAo0oEourAG cJ/rns89VgwbpGroKyy91nxHI1JdT3r2uYDln5k1WVIzOB5Sp3eAqVKTVIuM8BIezsSx Sjh1zfxT/kEtiKMBiy83/iEFKxGtgahW3FkQV7D1S1n5Mb1CuACm+YiGe8CHSmFS4jWE d5AVYWkxcVKfxMQv+R2YFA82cKMohocPES0UOgRNx+6uyjIoIb8oOX9Um21nq2BhQUn7 y1MKsfaFO75TNUddM9aaXTRecmbSRlJY0jal0klkgrrU3l7qq2BHLYshJc1elgh/WQFR zmKA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HYjzP8Qk; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720360127; x=1720964927; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=TlIeDL8GKxfHdH1Nat3u1/LAIKeplmkY9qaW2UKh5So=; b=S1ZvsSoK7twgNduccoJ9OxttULhWOfO1C1QDAZQZ4MKV5mRKSt/1rzZ4kA8dpDJ8cv utom6xKRo1EBUkVIsXslPAdQS1znoCGQiuIaQTcf34PI+nlBFnzVZHxasJ+Uuog7gvGH sgcrN3iXJ55mOgbwKYlqj8cTaz1qrIck0bb+M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720360127; x=1720964927; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TlIeDL8GKxfHdH1Nat3u1/LAIKeplmkY9qaW2UKh5So=; b=XTc504EE8pqIUCAeHot0+qhjp3CRSIY75tkanzIKOctnhmsqV68NnZM3FfZclAcqEI Ht2N/Bfp9kqpGV+rZAWcuFpPvTG1+LfalR1vrzLdb/NpDOiiz4n66KdOoBYlrYxH2Bvo +Yt9FS2tKGpS4qhj4RkFDEzGccQlymsF0cUW+GXq+NI8wSSxvm+U5a1bfZF5GH81KdgG BVe5HkuCasYtzOmuIdGFmmddU2nOl5l4Ezf4XCgcsR6gm0iDqOr7OkK70PmFJcF/+AdR ZPYcoCizjgNxKQ0o0CZU5I5C1zhutu0Y6zrzV8MGH6j4ZY1WeE/qrHvtL5LLxHuhniAd T12Q== X-Forwarded-Encrypted: i=2; AJvYcCVY6/F14gTZhRDEZTet//YoqVlOdgqxh4wWaQjiNkM2ZKQ7jGK28sVJOYDN6t2N1mjrXziSJQRVsOpgmjQ7+ZzSClfMn61e5KmTUDhHanGmmKmcB/tvOQA8AYyuJQ== X-Gm-Message-State: AOJu0YylRIcnva/LD++IWRds3hErp/KTbNWlPtKv1rZNHsFpYKL+R9rd JJ+ck8vaRSaf+tN7k5ex3NJubN82jZ5A65jW/+aAsghk0SFabzJEKxegnAG0wnZEQg== X-Google-Smtp-Source: AGHT+IFYo1YCrnCz/UBpmgJ7keZvH2z8KrddIHTksACa6beHHfPWh3OGxD15XtQjKmKcyRs9Xugo1Q== X-Received: by 2002:ac2:4568:0:b0:52e:710e:e4d2 with SMTP id 2adb3069b0e04-52ea06327b8mr7681939e87.33.1720360126870; Sun, 07 Jul 2024 06:48:46 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:3243:b0:52e:9d2f:232 with SMTP id 2adb3069b0e04-52eb2402c38ls32464e87.0.-pod-prod-05-eu; Sun, 07 Jul 2024 06:48:45 -0700 (PDT) X-Received: by 2002:ac2:5983:0:b0:52e:936e:a237 with SMTP id 2adb3069b0e04-52ea0621470mr7795224e87.16.1720360125173; Sun, 07 Jul 2024 06:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720360125; cv=none; d=google.com; s=arc-20160816; b=AbCco2cC6CeZrxT193ssRnBw9Ukz0YdR742Nz/zkB72sEWzdJJ9or9R7Tq4RCvB44p Ag3pwqH+wSIR8kxNpv6A6iT0Gcy5QbxeL2AW8clRhU5b7V7q3S0flosnwlFBTlgOSmfK hLdrc734qd4rvExbiNrq4juf2+a8eliraLVgOK2imedAaKnxbwgqUrovZRhVUtp75do/ CDiIhTOn4DCSFtPjJ+7vdR5vFSWn9yhR498ZAi0Otf9Mke/qofzoUSLAsWKVElUGYcmD tD0sxav7AEAKDmsM7iw1ImtPRfnunoyly5Fsc8xLaXbflozeGOe3yqZ+GIsPFrquQdU0 YIpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=ixGO1ZyigsNM2LOQiHAax7lmtRiG3UcItzW/Mvjt/os=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=na+o+pDd2JpYUaNpUlIq8kkvr84Xi8JpKe5joAR+xLZhgwBsjrrB/rnj2Sh9yFZ37W JB3PvjDK0x8Lk6e3X8H2vtXpvHUNMZYA/H9x0jlizkO93U0lRRpWJeQOsGLqnvRCbfgH TIa8AUOzRelfKdLwlSMJOmlSBKJk4S/HFvWlbUZ5NNRPizw6SHjVk+UdQMdVJXyRQXZ1 DChrCuc7yfRcnO0nKyf/OH5I2OyeBCTTU+jmrgXJbp/R2Oj2wB3nP02KycUgwZMrpm9N iNCcLgkDX99XGBCYxca7u7rrLIO9q91LhBwzZL7FoL/lTmQ6de9BDATnCzE7JZUCHhj4 2cFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HYjzP8Qk; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 2adb3069b0e04-52e98088f76sor2841446e87.0.2024.07.07.06.48.45 for (Google Transport Security); Sun, 07 Jul 2024 06:48:45 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:ac2:48b0:0:b0:52c:cd77:fe03 with SMTP id 2adb3069b0e04-52ea060db7amr7696710e87.14.1720360124538; Sun, 07 Jul 2024 06:48:44 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72b92985desm759132066b.78.2024.07.07.06.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 06:48:44 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/shairport-sync: fix patch fuzz Date: Sun, 7 Jul 2024 15:48:40 +0200 Message-ID: <20240707134840.4130434-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HYjzP8Qk; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- .checkpackageignore | 1 - ...001-configure.ac-find-sndfile-through-pkg-config.patch | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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 -[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 --- 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