From patchwork Wed Jul 3 13:58:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3161 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 26CF23F0E0 for ; Wed, 3 Jul 2024 15:58:31 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57cbaa7be59sf2233347a12.0 for ; Wed, 03 Jul 2024 06:58:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720015111; cv=pass; d=google.com; s=arc-20160816; b=fVgP151CiUzoWvepBFgNtDSnqz7G7KsFYbc2neDwlXZHlli+XiTfPskmPiHg+5lFmX 6Fhnf8en7CCppCh+uWQtFep1rjYZT4k6Z+fPKfLte461iFd1qSxrhgIWbzjTSu9qYPAo +5Z/wjP/LnwturgGdNHCmiXy1+IWb6htpPQt6LR20Jerf2zu0THN4iPnvM1OquNBM42p jahjYnT13dQEL77OidYshLCg7augdH26eea4FobDwWeoX2G0zR/C5xJPHxZNoZp7+ork bCSc8n9mUUgPlMFWGDyCCUloXeAgjQcH94Nxqo2LWkVb4kDQ+PksmxIL9eFwBOJMWIKO wNwQ== 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=9qXbC5DsOGW5Y8Z2w/TGmD18JXeaOrNxfq6jMjvlR44=; fh=vZcooQ07xpVhcP/9wLZiJ9+z52Ap2d88oBq8zYlx/Cg=; b=McVPgROa9uhqGIUXoH5XeSOD/4iuXXJtyEGmjSgM7sWeZM7N5I7hRBGwSlCMeynGd2 J9ZAe/dKTel/j+cEBSjttCg7RDVUyzRZLb2oiz7b+ZW8Hvfouide7yyurlDkJ7rmZ1j0 tAhRMyRslY2hLnvPEnz+acbf8GIMrhYDIY5N2O3u/Mpy26tepPeeLLTMxWUqfLuDc7Vu /v2JEv0bngsdmKfCKjUJMEuSXeWswcOH14CGUytQP9/CfvL9aDrqT1uFOkgNUCkfamRX K1JCjhhQU4u0CLQWERHa6GXALclvjeLVnVMJnRcMFTx+cJZBb9TghP3matLqZ/CIGOH8 olag==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=go4Bx3Og; 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=1720015111; x=1720619911; 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=9qXbC5DsOGW5Y8Z2w/TGmD18JXeaOrNxfq6jMjvlR44=; b=Bv4I2TmbQVj1OIyrgvZrigyrd3kF4tBZqOvBpA3xnrf59Q0JUHSCwXJz23gQMsZiJ2 dNdW4dd6+fHK02vDBiQ73YXWBolXq0EJ6oc6qgI7bcz04vxfG4/bsr4fu/hmh+x3djTj nbgj4/dLp348BxbH9UhZcZBWmCCXKV+ZKOYEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720015111; x=1720619911; 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=9qXbC5DsOGW5Y8Z2w/TGmD18JXeaOrNxfq6jMjvlR44=; b=ZySkpt/j04JeejJVaP8q68oSnS4+ooyikoJb1X6WMEf+AgKGmlOciKxJ4DNUjI5Lhu buA6mNA/pBi0gh4XTAPI7UzY0iSLeQ5QaLiaUZhtRHL/9c4kKcidIt+C38ZM6mjsSm+9 Cws2tzcItiR4ze32xGl3vAFt3JCkVwTAEQ1RMkq+thebKRINgmsUrXTJx94Vmdr1KVX5 5qtBV4vFn9KBQiwH6QSuWNNqpR/R8v0TeGSWw0LN9jHu6MozW56K0JV7uQPNottW7TgD VVdkVOYU3zdxB9DBOoG8j0AS1oa/jJt2zYQfx4Om7kX4xnJuEqfaFKUAAjSDF9nZA0QC Ub7Q== X-Forwarded-Encrypted: i=2; AJvYcCWfOjGSLdmStHLpL5f46FD/rzt5CvbBKBjheshazdii4LO3cpfA6/xFUQXd1LQrTGnroPw/SbVYavPZXOpiXMpKmeIsb5uPebTuD2H6Po2lw9tMjc9CtGdwK4ogQg== X-Gm-Message-State: AOJu0YzYtq3aEBTOHSEpdwVpUbomVyvYnllxNKj32xSSs7PNB8PSs2or D3wB7FHDM/YkfgtQ4uB5c7s6ChFL9eAQUCnRZzjjSi2NKcBI6w4BI8qxxmHfxr7XuA== X-Google-Smtp-Source: AGHT+IF4Oa3p5q5+9ht07iL6nK3v19bgGIBodmCZn7zwY+SEK6D8zVIF4bUFzcD+CWDQkZRC0apjow== X-Received: by 2002:a05:6402:5cd:b0:57d:10c7:aa4b with SMTP id 4fb4d7f45d1cf-587a0b03772mr7790802a12.30.1720015110649; Wed, 03 Jul 2024 06:58:30 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:c046:0:b0:585:2014:4d17 with SMTP id 4fb4d7f45d1cf-58640d5d47fls2657738a12.0.-pod-prod-09-eu; Wed, 03 Jul 2024 06:58:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXl5cGrG4aqz/cheUCKeT5x9KdVKPXCwJl/v/cw+pNc1ODV7mHgSzuy/PaLxVV0CFoHU+uXBtF/5IeHMOPB6hmbU9y9hdBKnvGI6DB/+zDHJBTP X-Received: by 2002:a17:906:4693:b0:a74:84e8:9994 with SMTP id a640c23a62f3a-a751444dae8mr807764166b.45.1720015109078; Wed, 03 Jul 2024 06:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720015109; cv=none; d=google.com; s=arc-20160816; b=ZAf9Uqq5OF69RbHJLXllIYpxz2hVE6OEPun6ZmUD4GGh26GEStC3qVmziuUx+lupPj MVDhWen0nKJScS4uyn8AgKJmpbk27odsz+tAu5KGtcRqAgRbggbc51Onwi3G24Bszp2N 31cV7lh5Dpp9SXxaSDSIOUWaeYS/mhy0wRQkcuj1r9etVVGnFWM9Aw+OV8cufpFK1uUj 1kH4NUs4FsT3ZdGLjJnkTO/N1W+q5Zd7Mcr4hDZR+K46tOVRwYVPd2WvqPmr79q6Kdor bcetHv46bLt/0YLbhoRkyf/PNbQnYpzT9RlsdVVMURMrYFKRpcD1gYB24UIg9Nt/eFRd IXTA== 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=+mJHX5f/rS5j6wGr8XQz+O5teukquuR/0ZxYT32DfWg=; fh=m0rxTEDxOUhn+xT8Sv9ovIsaEEo2z5sBlu6jwl3S24I=; b=BOcZtyH4V2KYnUzZah/dQbE5Cx62GcxaI9kHSL7+RC6r8j4Lla3Aa0MFBlyzQjZHmN 0slbUcuXs5T9WQofyPkBIPc8Xsgo0Hg7XO1TE2gc+dhTjmhEPy6WmiEaRTiqFHCzv8uf wrKddeX21wHlHE631LBgak3rKezQjPg7YLxjyza8L2egLH3RFOphCVpcixVtIsFKeawY vg9xgtNglTtFrMEtu26pRNq6KH6pHcaPDY+wEFRoWY+DZHg8Q0ugRLJDvX5jko3PGdhg Lbj/GWjRqmhWpBNdZNuvysAAyS5TA8Hq+knj/kllxJ1tdCQ2gBMhH7FCXpHH+0+l0afh hkcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=go4Bx3Og; 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-a72ab1758a1sor326743766b.4.2024.07.03.06.58.29 for (Google Transport Security); Wed, 03 Jul 2024 06:58:29 -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-Forwarded-Encrypted: i=1; AJvYcCU8fHjdet9phczikYtF0YpLtOE2HSMOA9ib4F9hZi8l1IlpkyugsfU5wUtzms6FUfGyA6PSRjcfVUVE1Hma3iqPcQWHhuo/W/bd6GUFukJQdMJ/ X-Received: by 2002:a17:907:d8f:b0:a74:bef:7079 with SMTP id a640c23a62f3a-a751441996bmr1026382866b.16.1720015106480; Wed, 03 Jul 2024 06:58:26 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:1a37:2bf3:7cf8:1941]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab065187sm513915866b.139.2024.07.03.06.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 06:58:26 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Bernd Kuhls , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/libglfw: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 15:58:20 +0200 Message-ID: <20240703135820.2739707-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=go4Bx3Og; 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, libglfw fails to build with output: Applying 0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 75. 1 out of 1 hunk FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - ...xt-allow-override-of-wayland-pkgdata.patch | 20 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index ca94fb56b092..fe2545c13db2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -825,7 +825,6 @@ package/libfuse/0001-fix-aarch64-build.patch lib_patch.Upstream package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch lib_patch.Upstream package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream -package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch index 4bcb5e4eb705..268b1248518b 100644 --- a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -1,4 +1,4 @@ -From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From a2c88988b6cfe4023fe78f13519b56a8ac9f568b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 4 Mar 2022 17:59:19 +0100 Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir @@ -7,17 +7,19 @@ Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} (needed when cross-compiling) Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glfw/glfw/pull/2053] +Upstream: https://github.com/glfw/glfw/pull/2053 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + src/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 01f191c9..475ce882 100644 +index 29be6515ae58..1767b3c8ad8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) - include(FindPkgConfig) +@@ -42,7 +42,9 @@ elseif (_GLFW_WAYLAND) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) - pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) @@ -26,7 +28,7 @@ index 01f191c9..475ce882 100644 + endif() macro(wayland_generate protocol_file output_file) - add_custom_command(OUTPUT "${output_file}.h" + add_custom_command(OUTPUT ${output_file}.h -- -2.34.1 +2.43.0