Skip to contentSkip to conversation

package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz

PATCH Applied Dario Binacchi 2 participants 2 messages Jul 7, 2024 – Jul 12, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz

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-tdfx fails to build with output:

Applying 0001-cross.patch using patch:
patching file configure.ac
Hunk #1 FAILED at 67.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

This commit refreshes the package patch on the current package version.

---
 .checkpackageignore                                    | 2 +-
 package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
.checkpackageignore +1 -1
index 0a1d2627455e..e0c406e56592 100644
@@ -1560,7 +1560,7 @@ package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat
 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-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/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
 package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables
 package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +5 -3
index e53591bb0bc2..f9880afb5478 100644
@@ -1,8 +1,10 @@
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <[email protected]>
 --- xf86-video-tdfx-1.3.0/configure.ac.orig	2007-06-10 21:01:54.000000000 +0200
 +++ xf86-video-tdfx-1.3.0/configure.ac	2007-06-10 21:02:06.000000000 +0200
-@@ -67,13 +67,20 @@
- # Checks for header files.
- AC_HEADER_STDC
+@@ -75,13 +75,20 @@
+ 	      [#include "xorg-server.h"])
+ CPPFLAGS="$SAVE_CPPFLAGS"
  
 -if test "$DRI" != no; then
 +if test "x$DRI" != xno; then
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Dario,

Le 07/07/2024 à 18:21, Dario Binacchi a écrit :

Quoted 5 lines

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-tdfx fails to build with output:

Quoted 8 lines

Applying 0001-cross.patch using patch:
patching file configure.ac
Hunk #1 FAILED at 67.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

This commit refreshes the package patch on the current package version.

Applied to master, thanks.

Best regards,
Romain

Quoted 26 lines
---
 .checkpackageignore                                    | 2 +-
 package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
.checkpackageignore +1 -1
index 0a1d2627455e..e0c406e56592 100644
@@ -1560,7 +1560,7 @@ package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat
 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-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/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
 package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables
 package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream
package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +2 -0
index e53591bb0bc2..f9880afb5478 100644
@@ -1,8 +1,10 @@
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <[email protected]>
 --- xf86-video-tdfx-1.3.0/configure.ac.orig	2007-06-10 21:01:54.000000000 +0200

package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch line 10

Quoted 10 lines
package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +3 -3
 +++ xf86-video-tdfx-1.3.0/configure.ac	2007-06-10 21:02:06.000000000 +0200
-@@ -67,13 +67,20 @@
- # Checks for header files.
- AC_HEADER_STDC
+@@ -75,13 +75,20 @@
+ 	      [#include "xorg-server.h"])
+ CPPFLAGS="$SAVE_CPPFLAGS"
 
 -if test "$DRI" != no; then
 +if test "x$DRI" != xno; then

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot