From patchwork Sun Jul 7 16:21:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3195 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AF01343D73 for ; Sun, 7 Jul 2024 18:21:58 +0200 (CEST) Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-52ea249d1c9sf3028584e87.0 for ; Sun, 07 Jul 2024 09:21:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720369318; cv=pass; d=google.com; s=arc-20160816; b=kmSHfhLUDJ48Crnz7O1JQTjIfsSSQVHmnLUnUtLOZ9A8+AsrK+UxIRXXfzMOLr7y0T Qd4XO4ZwzsmC1JJM8Ks30H5is0JzfzjTBHThggVFjFl6PyNjzqFXv7HxD2PBC+hXj9l9 uOuMRdsHULOtYO7lBvFAMzwmyMg3XDte+YeJ9vgIyb7e9i5Uv2SWsoSTNBZ5GnrD4oF9 M2IlejDnjvx+WLpowot7J+8TlFwnVdroZBVRoC/rf0UPrOzv1dnpLNRHXF3kCC4NqkZt W2ZKrfa+nXEDaJmFe2otRhuEtupkBQDHrmYidIA8Bsh1IRgIu3RWLih2+nisWjs2Mx1s Fzvw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=SkdhHqYa8pS6jPNco01fqfFY9DweBsT3nKQgHpWhCqA=; fh=n2pdJY7DYry0Qito/kTzA+jKR5RielN7mwmUu2nwObE=; b=aQdOYS6W5wuvJ8ZqhUps2UCdSzK72ACehQib8+BNhsI0HMMvSrFy1Pr1xNLX1gNgcQ ziFyIodo+S18jGpmPlcduRSgAVexD9rem7z/62qEHAM8in3GveuH7NP3zNCWY+8EHzCK dO3azHBGEeGUJIM6WQuRq9vCp/EVaOShALbloIHoTniXbMrL6RyCyYRu5tn8SWMAzslo snySRCMCF5j0tdr6WHaOdNlszNFR3mVRoZs47ncCOZU8axpLutWoGkdLudc7Vbe6q8Hl 8a+2qsWp7KWoJjt8+dNsQQbrnC/bue+0H6kVU4Gb2BPs3L4uEkLTTN+NUTHXv7r1HrGv m8ew==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kFWTqt7p; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720369318; x=1720974118; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=SkdhHqYa8pS6jPNco01fqfFY9DweBsT3nKQgHpWhCqA=; b=GXFRes6+TUONkBZRitm38f1KFgj+KUI4A1h9RtIB2O2vqk3ETeI/sfPGylZBqW8wEu q2ndHb/u8Gb8RQj/f1bKsS6mWmK/Y9XO3i1r20M5iV5rQfAKpN34U5Z7oowfooDJVryb cRsOyzAdGv0LtsbSsTq2xe92A65N5DGavxBbY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720369318; x=1720974118; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SkdhHqYa8pS6jPNco01fqfFY9DweBsT3nKQgHpWhCqA=; b=ta8a4MlW+5FtDtTaFuxhtg/Zi2DVxyQcY4cCpHjk7RQm8cvkDDy7CfKRHSkeXfAIPt cjZXn54GFBQQIaSk1U/UVEPvsmn1quF/l1YK2iGiMclM4Z3S9kCxjTG7FWfwgH9/9ZUp +o164PHGoJn2iG5JWkvlOMOVY9cNSjRo4vmFMPnCy3+mgpxdx41ph0TD6/SyCrFhxMSu 9Iu5v1FU92tPF+z6IjdN9mLqK5KrhXuJNrWm0559XFqODJsp7c4Jjz/C48YPV1zxnuEX t6XNfaO3UOI0wFklEQh0GEj1CjQwTDjb29OUfCQvjLX9XGb6P/04Qo+DxPApVkD4Lnbi WNGg== X-Forwarded-Encrypted: i=2; AJvYcCUdrSSuLvTrhGfukWIUxL4Jb1vnCADlXerZYEJDnaEMqm8J/k9ZoWCSHkRBvTzKDW7m/OugEo4wVlssNFG1GotHg1+HKgze6ShaXbEih0t3rGMITUr+vGuCKgZ8/A== X-Gm-Message-State: AOJu0YxvjcxKRg9mqzU2PpkxdzkUKZO8g0WlwazDGqXWTpsQga2VTOUm 8XJWgIrB73ew+PHy/OnngFOuwYaHTK2Alr+5KWp4wLQgaJbNUmrLcOBrZGBobXdLjw== X-Google-Smtp-Source: AGHT+IGSPz7C54dHoYcgYPmvJ86Aj4COJeeEnjOE4vbk04+dDYm6et+q+Cz4muaGaY9RoRhZ/FK9eQ== X-Received: by 2002:a05:6512:10cc:b0:52e:a699:2c8c with SMTP id 2adb3069b0e04-52ea6992d0fmr6031321e87.45.1720369317883; Sun, 07 Jul 2024 09:21:57 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:3608:b0:52c:dc57:d9e1 with SMTP id 2adb3069b0e04-52e9f30f733ls1389706e87.2.-pod-prod-02-eu; Sun, 07 Jul 2024 09:21:56 -0700 (PDT) X-Received: by 2002:a19:2d18:0:b0:52c:e030:1450 with SMTP id 2adb3069b0e04-52ea061fae2mr5605652e87.14.1720369316157; Sun, 07 Jul 2024 09:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720369316; cv=none; d=google.com; s=arc-20160816; b=d7xwMzAnZiMG2T6FxYFBFz0COoLGNhJ9tlkMoeWrKD1LBTouP/fuWjtJGWfbmcsYgZ QeZjRdSdsRv5d47jwR4eppi7ViFvvI9KuGtq0NXrAcywgNqAW4lLxiurzQLPIKMs8Qis h48qilk5UjuZUi7LKieq9oJgRv0DdHwYyxkmZDUqtqJNjhVyGtuWxzxa8VE9PUxQva/G D6HkaVhUPFGxIuBv2N0kvUW5+MsNPdzdVYWmKo6fidFdKUjR2Dn9P9Cl9a0G5NA3Gf0Y YfbE2ianfJlk19KkvuxSgGDLPkjFa0OidrQsU+FQP+oAe+QRMj70HcJC9VsB2oavQgZL C+tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=QAIxgnTTHEDwnHLlQS3tBelM0zoGI9JWQq8TwJhCrEE=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=yBnul6381LnHA1dCNzYFECkToE6IkQQGLe7+c+R3rbuYT5taa5MT/+abZYxyiAUp50 vaS+p88PMXJn7+A4vAq++npRfscGYE9ZYj0whOBZRUOYp13AcvkSJf6FqG4z59jaFl7V qTY27lM4L3qAZ9sBE0pz2J31Phu4wyjhLbeS8l4mYZDbujSK7wSm2wmepokp0SDvipD/ REGb/on9aBa1HyImKjXeSi+LTOAfQUCLuHotMSr8dTon5w4uxHW+s0Pjix0BLYt/Tm++ sB+4BIhWuKtoAt10ulS99rWgPrJMMk6qDd5lu7gfUEsGGl+6+gBDuDGOO+mtblGWhiVu Ef2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kFWTqt7p; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 2adb3069b0e04-52e9ecdd48asor1915049e87.0.2024.07.07.09.21.56 for (Google Transport Security); Sun, 07 Jul 2024 09:21:56 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6512:ac3:b0:52b:b327:9c1c with SMTP id 2adb3069b0e04-52ea06e92b9mr8017291e87.62.1720369315382; Sun, 07 Jul 2024 09:21:55 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77ccee5277sm228472466b.177.2024.07.07.09.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:21:55 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz Date: Sun, 7 Jul 2024 18:21:49 +0200 Message-ID: <20240707162149.302187-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kFWTqt7p; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Signed-off-by: Dario Binacchi --- .checkpackageignore | 2 +- package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455e..e0c406e56592 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -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 diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch index e53591bb0bc2..f9880afb5478 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +++ b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch @@ -1,8 +1,10 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- 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