diff mbox series

[1/2] package/libmad: update the patches to be applied with fuzz 0

Message ID 20240702133655.2425922-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/2] package/libmad: update the patches to be applied with fuzz 0 |

Commit Message

Dario Binacchi July 2, 2024, 1:36 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, 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 <dario.binacchi@amarulasolutions.com>
---
 package/libmad/libmad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Korsgaard July 9, 2024, 5:06 p.m. UTC | #1 
>>>>> "Dario" == Dario Binacchi <dario.binacchi@amarulasolutions.com> writes:

 > 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 <dario.binacchi@amarulasolutions.com>

Committed to 2024.02.x and 2024.05.x, thanks.
diff mbox series

Patch

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 084a533cc00c..9f3396b1a4e8 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