From patchwork Thu Jul 4 06:37:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3167 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 BA19443CED for ; Thu, 4 Jul 2024 08:37:29 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-58cdd86c091sf242703a12.3 for ; Wed, 03 Jul 2024 23:37:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720075049; cv=pass; d=google.com; s=arc-20160816; b=u7Hd1qVu9LLHWfVeSd++0q7P/31AJnCTCw2NsaEzV+2jpOzENG2K9VA+eFvzFt4GHT Y0ufxYlQpiAmhgzfzGupDP/noz5fIlM3IGKZ90Swr63mGodHPVvRA6bGncHE8vQWFK0R RdT4Cwf7/VU+TWOH1IUMSjR5IbR3XtnPBc8VnJalFCACyAwhLLlKNhx0k2e2ahS3CxnU d4TV2HmGTJOFcJMimvVB9Su6ICui3vZJtDWquxujqRpvbMDai8igfWOJoFXnChAjghoa Lswpj1c25ccdy7xyAPROSffTEP9pZsiWYtetZSNLhxpfT1+OGdhS621XE0VDOv9uyIXG H+eQ== 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=wrW+vtcTW1nARQdS5kXr392Hu4B8T52mynT3aRJn2gM=; fh=MoawI2W//VqPzxGD1BsQvgw7vbD4nPfAJFDiKfkoEO0=; b=VWg8v2yX4f4aD9c5mlYVZ0buW1rQtvrUGqMC38m67qw3HXV0rbaMo7PI11XpFwDfwc zaPKemnMW8wqXMx3kdq8wuJ8RnXCjXi0Ug9pUNy3PkXx5dNINf9IRol8VE9EZtXimgpk TmbNC7arW9T1sCchswBThKiV0HOocbrh9zGwfJQ7VFxJFdBvmcRzycVu6P1J+5auAose Ia1jrwaevq9ck0uEUVijVvgMuBDKQnjD7FYqDV9taqy4CwEAgJvbnSvEDYnJOTHiSprK rkGJBU/2uq/SIvGpoDsPSdXwmD2uTLU/Oou5HnAdfrjxWsWbw9QVikcKbbmjiUNjoefO Z/Bw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T2G1u01a; 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=1720075049; x=1720679849; 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=wrW+vtcTW1nARQdS5kXr392Hu4B8T52mynT3aRJn2gM=; b=e0wjmWhzW6aX2U689RS4DDi/QpaW/6ScGKLgBce5J8ZwYjeO0I4YoWmDqXct6Wq9az i7Xa+5q+CpggJuOtOL08G9CVGbfkkp9EvNzgvujrVMSHjLryGqUJNjhZ2WL0A77IfeAF tuVKI0DUf3kTyf8bEC5GqXI6Myd3XNARzGzvg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720075049; x=1720679849; 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=wrW+vtcTW1nARQdS5kXr392Hu4B8T52mynT3aRJn2gM=; b=sG0/E7cJKK2+jRgyWCajG39INpv14ItGwyRyUOvJ4C/XQ2VZCdVWrxhqTVaxeNtskW i+SMhdKAiwvSA+egLOfljGu0TiE19iZ0k5abUVP1n2Oclfk5fHHoksEQoef6m7IPajE9 5oibIo+1ZLn+PrcFwANtoB2CDx3S/mHNA/TVG4hqTxEs3LATfvv/7zelhWqfDSoUZ04q lDFUTZVEvcbfE2AvjBGn3s8Z/prbjtn5Gyae4/befjYHjTtdJNXfphW6sDqd6+UKNZIO wYIANdGLdlTJ8RY7QfvZXW3xSWVcYHTo7kKJxZytO7trkRsepps1sYcLskVx0f+EQcyj h4jg== X-Forwarded-Encrypted: i=2; AJvYcCVx0zoEDUGae92Xh/FrYfck/4L+sHV30PC3MBTtCvptB/fp/D0H1ONtR8GhKBkGdxJRR9oQFcWEIpI9Q1G2Cozc6tWmdPS1GfKEVVcp90WpS9dNJnnVGKvT4dgJiQ== X-Gm-Message-State: AOJu0Yxeb2tu4r9alWI9JoXhkE/CN4D/W+WBl/53INQVIJXvU9y0hcl3 DbWrT4r0qwFxOTD8SFF7OhVzEbR9Sl64UjBQeeNXWJaKPYQpSEp8MNUB+n4F+rvrXw== X-Google-Smtp-Source: AGHT+IHU8Ldh5FF1fMqzCAUoDgVs+Ml+inBT3QocySqmxu+D7ARES2MCpXA07EAA4qpxqStjreicug== X-Received: by 2002:a05:6402:1e8a:b0:58e:11e:4e19 with SMTP id 4fb4d7f45d1cf-58e59d3d4dfmr504337a12.25.1720075049263; Wed, 03 Jul 2024 23:37:29 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1d37:b0:58c:3dc1:35c2 with SMTP id 4fb4d7f45d1cf-58e201904a3ls162423a12.0.-pod-prod-04-eu; Wed, 03 Jul 2024 23:37:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWObmDej7nLSyLDrhL1p4LxtnbwgXmSUB3fifg3TSEkM0cdxLAC1n68+5CdaOhclmCX+cim3HuqyD3rtLRlR/uReWUJ7kdB7pBKgK30MqiNhw+W X-Received: by 2002:a17:906:f88e:b0:a72:7a43:5caa with SMTP id a640c23a62f3a-a77ba7e19c3mr40888866b.47.1720075046635; Wed, 03 Jul 2024 23:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720075046; cv=none; d=google.com; s=arc-20160816; b=IRYSHvh1E05I6oLzp6LWhrkTahThJsvQStTMDjtKzPWG6aiOXbIJAmLSAMO9+22Noj Vost9wPDN7xWT1bQ8JuRgu8Kn8+JoBwNWONYqee7CFxCMCqqEUkSkYDuQd0L9ej0ItHr Ew91ZFVIyfrxUnHW+9z3feNXDSb86VQX+LiIPf2PLmvJTnZoHaNjOoQrqnnXD8JBNk3V pAoJL1pxbAXhJuSr2QmRpmiNZMC6+S8xTg0T8m9Q32Ry7jnVaGFKaJQaej2rG97/5mp0 nwaEN69D8hZ6Upn96t6Bwmd+4R8tTZuOgVyWsXUMFMTEuIp2ap+uimulRSCXi9vp2N4V hyxg== 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=0hTsGcgKsNq8ORZiYuuqTf6twvNl1sd8w2ywRFaNF20=; fh=jV5KntQ30IuYwmHjRSBJS2Z25jt26FRJsEMtFbRF72U=; b=Dex6Lb90wdTowJN6NzFxorICjZ0FUKZF3ce2OyVLDrSgUlCbAQ0iuv5hE+u64/jWnp ZddZcAvr5k0u/kWIoTxTHyOjieWZqmTIt6PcOtYyKDQZthaAbin1tjumH2YIc5HQViRd xGMmu3kVZ6PUIGfU+PWT9Gvum8eMXKIniNaoyS5atrx3XB4V8MPjs7aqTDslzR2m6Go7 kLk1484frNeYO+fvJ3Sy+faFYdRa8vHJgyu1rzp6t65CoXs0Fr4C+O+mzUf5xC/9F643 FgprsJ3IgAsJbVIEiEf3HjoGFycI8OOsa13C+PPMvhbizE2i3bsAOxwqdrvrUrX8sda2 Lvxg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T2G1u01a; 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-a72b28f31e4sor348181666b.12.2024.07.03.23.37.26 for (Google Transport Security); Wed, 03 Jul 2024 23:37:26 -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; AJvYcCVXw5swgJKh5w2VjWg6FLfTWVgTTVDDrIWZurOXOqqPjTREpdiH6ih2XMspplRpSMWKv0hT0wy3lZ2UUhvjX4diyvgnGYKS2TDgIeoc0wTNFraV X-Received: by 2002:a17:907:7e8b:b0:a72:46f3:ffc5 with SMTP id a640c23a62f3a-a77ba6fbb8cmr47898966b.28.1720075046079; Wed, 03 Jul 2024 23:37:26 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:ea87:116:a8d5:fa85]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77b8eb56c1sm21713066b.176.2024.07.03.23.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 23:37:25 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Bernd Kuhls , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2] package/libglfw: update the patches to be applied with fuzz 0 Date: Thu, 4 Jul 2024 08:37:22 +0200 Message-ID: <20240704063722.2902990-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=T2G1u01a; 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 --- Changes v1 -> v2: - Drop hunks also for patch 1 even if it doesn't report any error applying it with fuzz 0. .checkpackageignore | 1 - ...emove-extra-cmake-modules-dependency.patch | 18 ++++++++++------- ...xt-allow-override-of-wayland-pkgdata.patch | 20 ++++++++++--------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455e..9f4331d206d1 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/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch index d5ee7c829a45..ffa1d13f5134 100644 --- a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -1,4 +1,4 @@ -From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From 8ebf1067390948d03330a5a0c814e5f7f860e678 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Mon, 28 Sep 2020 22:23:02 -0700 Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency @@ -8,17 +8,18 @@ Fixes #1774. [Retrieved (and backported) from: https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0 dropping all Hunks] +Signed-off-by: Dario Binacchi --- - .gitignore | 4 --- CMakeLists.txt | 16 ++++++------ src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ - 3 files changed, 45 insertions(+), 37 deletions(-) + 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42bfa1806d..394827520b 100644 +index 75069161fc36..b315eaa15305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -191,20 +191,18 @@ endif() +@@ -249,20 +249,18 @@ endif() # Use Wayland for window creation #-------------------------------------------------------------------- if (_GLFW_WAYLAND) @@ -47,10 +48,10 @@ index 42bfa1806d..394827520b 100644 include(CheckIncludeFiles) include(CheckFunctionExists) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2f2bdd883d..e834506c6c 100644 +index b6dd86c54512..29be6515ae58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) +@@ -40,30 +40,44 @@ elseif (_GLFW_WAYLAND) posix_time.c posix_thread.c xkb_unicode.c egl_context.c osmesa_context.c) @@ -119,3 +120,6 @@ index 2f2bdd883d..e834506c6c 100644 elseif (_GLFW_OSMESA) set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h posix_time.h posix_thread.h osmesa_context.h) +-- +2.43.0 + 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