From 47caba65a0245812e21de9c5a6de92920d3b3c1d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:36:54 +0200 Subject: [PATCH] package/libmad: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libmad fails to build with output: Applying mips-gcc4.4.diff using series: patching file fixed.h Hunk #1 FAILED at 297. 1 out of 1 hunk FAILED -- saving rejects to file fixed.h.rej The package applied the patches in two steps, first the local ones and then the official ones downloaded from the repository. The commit fixes the issue by reversing the order of patch application steps. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit b21184a87733f2f2ccee69cade6875c507e439dc) Signed-off-by: Peter Korsgaard --- package/libmad/libmad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 084a533cc0..9f3396b1a4 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -19,7 +19,7 @@ define LIBMAD_APPLY_DEBIAN_PATCHES fi endef -LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES +LIBMAD_PRE_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES # debian/patches/md_size.diff LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373