Skip to content

Commit ceba36f

Browse files
passgatRomainNaour
authored andcommitted
package/x11r7/xdriver_xf86-video-mach64: fix patch fuzz
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]>
1 parent f2f71ca commit ceba36f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.checkpackageignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@ package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch lib_patch.Ups
14831483
package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch lib_patch.Upstream
14841484
package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream
14851485
package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream
1486-
package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream
1486+
package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Upstream
14871487
package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream
14881488
package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream
14891489
package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream

package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
[Dario: make the patch to be applied with fuzz factor 0]
2+
Signed-off-by: Dario Binacchi <[email protected]>
13
--- a/configure.ac 2008-06-23 10:39:28.000000000 -0400
24
+++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400
3-
@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo
4-
AC_HEADER_STDC
5+
@@ -80,14 +80,20 @@
6+
# Checks for libraries.
57

68
if test "$DRI" != no; then
79
- AC_CHECK_FILE([${sdkdir}/dri.h],

0 commit comments

Comments
 (0)