[1/1] package/x11r7/xdriver_xf86-video-mach64: fix patch fuzz
Commit Message
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, xdriver_xf86-video-mach64 fails to build with output:
Applying 0001-cross-compile.patch using patch:
patching file configure.ac
Hunk #1 FAILED at 85.
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 | 2 +-
.../xdriver_xf86-video-mach64/0001-cross-compile.patch | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
Comments
Hello Dario,
Le 07/07/2024 à 18:33, Dario Binacchi a écrit :
> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
>
> Due to this change, xdriver_xf86-video-mach64 fails to build with output:
>
> Applying 0001-cross-compile.patch using patch:
> patching file configure.ac
> Hunk #1 FAILED at 85.
> 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
>
> This commit refreshes the package patch on the current package version.
If the upstream repo use git, it would be great to convert to git format-patch
instead of diff.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Applied to master, thanks.
Best regards,
Romain
> ---
> .checkpackageignore | 2 +-
> .../xdriver_xf86-video-mach64/0001-cross-compile.patch | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 0a1d2627455e..63174590d446 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1558,7 +1558,7 @@ package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch lib_patch.Ups
> package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch lib_patch.Upstream
> package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream
> package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream
> -package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream
> +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Upstream
> package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream
> package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream
> package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream
> diff --git a/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch b/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
> index d27617606eac..02d34ce9fc3b 100644
> --- a/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
> +++ b/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
> @@ -1,7 +1,9 @@
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> --- a/configure.ac 2008-06-23 10:39:28.000000000 -0400
> +++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400
> -@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo
> - AC_HEADER_STDC
> +@@ -80,14 +80,20 @@
> + # Checks for libraries.
>
> if test "$DRI" != no; then
> - AC_CHECK_FILE([${sdkdir}/dri.h],
To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
@@ -1558,7 +1558,7 @@ package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch lib_patch.Ups
package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream
-package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream
+package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream
package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream
@@ -1,7 +1,9 @@
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
--- a/configure.ac 2008-06-23 10:39:28.000000000 -0400
+++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400
-@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- AC_HEADER_STDC
+@@ -80,14 +80,20 @@
+ # Checks for libraries.
if test "$DRI" != no; then
- AC_CHECK_FILE([${sdkdir}/dri.h],