Skip to content

Commit

Permalink
package/x11r7/xdriver_xf86-video-mach64: fix patch fuzz
Browse files Browse the repository at this point in the history
Commit 8f88a64 ("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 <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
  • Loading branch information
passgat authored and RomainNaour committed Jul 12, 2024
1 parent f2f71ca commit ceba36f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,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.Upstream
package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>
--- 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],
Expand Down

0 comments on commit ceba36f

Please sign in to comment.