From patchwork Sun Jul 7 16:33:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3196 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id CC1493F1F3 for ; Sun, 7 Jul 2024 18:33:35 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-58c08df32e7sf2640350a12.2 for ; Sun, 07 Jul 2024 09:33:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720370015; cv=pass; d=google.com; s=arc-20160816; b=yrAIU1Zy7ArPG2ZzxdvKK+J1sspIPFuY63NSRbcEYMQvQwkcaFzutzbDOj4VLr+42V dz8yy8RIIn72Ls8xnLnoibrtVzO1bZbi3H6/3fkMgA0KcOpTCrVGg7pITkwlzl1xh017 3YubPS2q9+lpHKDntKfmEnaCkkoL/EI1SPlDfNhBicn2CdSuS8UIVG01h4DDhHfiXqLY DSsXkbSfk9kKfoLuXNfJdj0+woGMaHescBTcEEsD/OP+QyqdkHWsNzHOouZXvC1iFH3C TpNEYJAXP1bpEqQxuAnZ4l2GHRUWwwfNbmEvhwGnLGQQXi5IPkINIFbXHrWo92oO5RuK beNg== 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=UoINDUuR6HGUPJzew4FwwuTh6ljjHPebDjR86p+CIPs=; fh=3e2nvCjggaDqSKn1CYI7BAqE3CECtHoMkKcvDPH5bkI=; b=ars73WoDkSTzvdsvPLFVzPKbBpZe4kJI6wYjbNIQyXbPe7NuILugjSpu6FE9zhfUDb w93A8IrlH9wBx4ntpH65fij+McDStZePNHOvJNd8V6uZhj4IyFZqSklQnvt+gjUv+2GA ekTXxgB2Zq74qK6GMWFOijMjP+8x61ZmmaOSg94TqRzA8qfcDIE6KWtXKDHCIDPDThvM CVzhnU0zZf/lD0hrOyR8NEOj72mMuIp1OKdUNAughDdmOKSPsMEUCDU5QMbnMRWb0LmZ wRuksw+4Zbg9a7pqnlr9WoZmCx++j6XPHWNlBXYMjaQzvjKYZ17dSL0184OlToyZ4Ni4 NHEw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YMyUD1Tr; 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=1720370015; x=1720974815; 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=UoINDUuR6HGUPJzew4FwwuTh6ljjHPebDjR86p+CIPs=; b=eK2Alu0EziITCRbYn7Z3SBDjNzMl9MJUgJPomfHLAmFYyuh8jqw+q4ndBtCDjx+kmd lFi3Pkboo7g6hI0shYwgry+6uGvSXvsmXkHWTyLsnCtBwmOhd0JNRCmeFwauSrrzDnTO BDLk7wWWs3tdgktgYOkbrfSrCLlBMgQK89bmU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720370015; x=1720974815; 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=UoINDUuR6HGUPJzew4FwwuTh6ljjHPebDjR86p+CIPs=; b=IgEOR/wSagulMiVRm+1F5q6n7gUPM569qqKyfkHC7smiu7NQujjpzqwrDGwByrCskf qe1ZgH1MxCgGjkDg73S9IPu48ScG2vIuqxLlY6LaWDGujixreg62QoHaxoEN0mq7Hg8Y dFNu6fZgAbyq5qRd2rWumeDT+SjiQxy8nISzPwGoH4EK/KDmZYk+yhDaMqeQfK09jBLi ALEFgE8RQSoF3eOM5zu7U4tq7/2fw8wPtl36FwrigH+BFEue0SFF7HqoP51vw4kuTDn4 pgwU8w59IJhAaIzp/0jy2SFBAlCHD7oTVhwzHL7svN/MTfRDBYM9U1zTP052f+lrbFr9 hH7Q== X-Forwarded-Encrypted: i=2; AJvYcCXaLZq/yryopl2RBo0lOP0mxsG/edKWxS1qmE+7boHBDCmOWYdgzk74ngbPz0hF9M7PALA7pcOMt4+BAzuXcBGC0N9JTulz+FmY7B4npWx9NTGuMJ08Fi+UHOSy5Q== X-Gm-Message-State: AOJu0YwgLcnV5f0vgL0bnTKTDuS7e4SHwtoknKEMBcj+BV4cLFPMEvgr FJhewSQv/VmJKSrUlU070Mf2/Y1NZuAZBXG9LLEYKuFhzNZczA5L/cyTa9Itv8teeQ== X-Google-Smtp-Source: AGHT+IFkfh1VfGYmYyL+1Fm/7bomvjWAf8sLctFIXsrrpiumI5RHQ4jZskOqXKRiJEeFzENzyAZdkQ== X-Received: by 2002:a05:6402:50c7:b0:57d:2c9:6497 with SMTP id 4fb4d7f45d1cf-58e5a7f0fd0mr8850413a12.3.1720370015299; Sun, 07 Jul 2024 09:33:35 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:a4a:b0:58f:749f:1c63 with SMTP id 4fb4d7f45d1cf-58f74ae60dfls998749a12.1.-pod-prod-08-eu; Sun, 07 Jul 2024 09:33:34 -0700 (PDT) X-Received: by 2002:a17:906:e286:b0:a77:de2a:aeee with SMTP id a640c23a62f3a-a77de2ab23dmr413711166b.43.1720370013803; Sun, 07 Jul 2024 09:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720370013; cv=none; d=google.com; s=arc-20160816; b=E9WbGh73AyK4OzoR9nnUiRQW8wTj2o7jkPOXfWtEaKm76rJamKRmEco+tPWvkkWWF5 TXLy0wyo3vZPzBwTsKjSxtrkcqGmAl1ejCKSaW+wwN9GGMGylCYozo0g/4iDR+xxmeyg XxE8HQgOOHd8hXRcT2pOmDzXE6UZ0PZGGMKt5LTsFa6If2Iu8tvbxXhmyiACUooxp/zR YsxJXEbzFvINFLaqukKt+wKq75ksdFUYYH6aGBsovuNpuTvRSTvag/ohuUN6SnK+TClb qVz6r1oALcM1bF5CVlDePhpeiDvsCEQnbKv2xX4EEY5sH+6F0vntrhB/ImJo5fyMGmwE yBsg== 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=itrTVs+5iBqNAsiojfeI57Vk5TY9R8QDm7sviYX3Sf0=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=H7Rr54NNTChn2TdIURm16lXf0CarhkmicYsvZJkHOA3np8M8CV0aUHxmkmDBlsEFQG fdnP20my1Opb2lZpYthi4CKpyGISLt2stRiYv6RitFrAaHb83QFfxn46elYHPFE9tPiF 1jVFFDoDGAJa9OwlLAhzY9Iau0Y6RsbzFr1s/pfTcTZCp7QHZojI1emF34YWnUSnQRFB ue7fU309opTQSUsHnQGvVBJtQ7KROXF5xN6B1z8CiAo2v33iHJW2QTOd3X8qyi09gtTu mzyojcNWlN5n0qraN9oC4NL3AFRUAMomWYg1kgXnia6M/sHK3lnAAMleVAsCCXRyVwqU +PwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YMyUD1Tr; 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 a640c23a62f3a-a77ccba3eb9sor125511866b.18.2024.07.07.09.33.33 for (Google Transport Security); Sun, 07 Jul 2024 09:33:33 -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:a17:906:f2c8:b0:a6f:4804:d41a with SMTP id a640c23a62f3a-a77ba70c750mr666520266b.55.1720370013109; Sun, 07 Jul 2024 09:33:33 -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-a77ed4eb787sm91384666b.111.2024.07.07.09.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:33:32 -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-mach64: fix patch fuzz Date: Sun, 7 Jul 2024 18:33:29 +0200 Message-ID: <20240707163329.306725-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=YMyUD1Tr; 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-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 --- .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 --- 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],