From patchwork Sun Jul 7 16:46:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3197 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 C104143D73 for ; Sun, 7 Jul 2024 18:46:08 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-58d7b8f1e1bsf4962225a12.0 for ; Sun, 07 Jul 2024 09:46:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720370768; cv=pass; d=google.com; s=arc-20160816; b=vSghaVplCjxMFQq+O0WrEQgslFk2SiKH4Qstu2SLDbusMwWzjs0/291RzgvnjwZX1J +K/ePjKdwD4HqOg/0KRw2ibWzoetnRaVDJO6Dvd9nfMe1F0c0mFgBf9xmRKmVFcbzWU4 iBrRTLpzAwCtOeDTxigNgqRW4aq9ezSx6I7frTWetW9+N7dRc5HSq7j9S1C/AkoZUFpq R0csdKgl9rtqZ2O1qvdsrvC+ytodJL01C8c4/BD1ncL3Y2moowbbET6cA9NakCs50SMD OlupYlHEVXpKF3vLzHuUNORFQbyR2u3l5+JfFKGHjbDmWQF6OC1eOZT2GA10FjjPF4OL qLzA== 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=We/fuyu2p0i5L7wzRIszl2bm66dff75P6qPwk5YhJQs=; fh=KBipF/+TTY8S5n1/1UQJdx/u6w1ogAimGim+HxaqNo0=; b=LZgvA+nRqO82X8euxSXJMtJKcmghzbjip0fv0VkF3N/92gvYuleRuTbFijtaQpIxL+ hOCRcgaZszebKLZq/N6wKbCa6qGQOREX7ypkpOkbJUdZzR7d5d1cZqvnHZjYIjzTogQn au/mDwyoZIacJEg/+Ux/ASniiWAOEzTkT8aSIC5ZCCktvBO+7NxuwHl49TWH6Z2aHSFM KAl3cMGp8X5rK8vUuqUlNKQ48cPLBvfEDTuZUHhQT4xEBiw9/+XyMWKLAqTBnbVs39uA a7eMcHfqiST1Vb7amQkR2VQ1zIvbu1V1uz4lLUosZ+VdBWUuOQaATqayMMTeBm8JwEuN 3u1g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LzDlS32I; 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=1720370768; x=1720975568; 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=We/fuyu2p0i5L7wzRIszl2bm66dff75P6qPwk5YhJQs=; b=MrQnRH6DLi44yAB7fnfXUCu5xRWdOva4IXykLrxPzFB6I9P5/MA7F1hOXX4zvRx8o4 VPm0UyCvzlnFfjHbItzVlnLX02iTvsJLl0SO7FPAPh34puSb3gS1oOss+ihtGSir4g5B gIAxGIFZzcrzpuSI6RB1jroOPN+OYbJa1pw4c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720370768; x=1720975568; 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=We/fuyu2p0i5L7wzRIszl2bm66dff75P6qPwk5YhJQs=; b=qyZe6P31MuGF9JPqSsLIT0TvkTWF7PqqY8Ri3BbQmj9m7JVFSy93utxIwkZLSvvDn8 N4rwCJ9CcSbFOD+BErnT3eIgzabikoidhfWOxWNSEBn7EwNiL5pS8IDU+j8qf1GQh+BL Cs9K5OytmUEffngxPtXVrBAGT9+7EZB2j1z+1sXp8nktq13gw2M+3oqPodpiRXr+5/Kc 1R3FyJFVCFgztV5ESvLfVfRYUwrB5VL6AhbaLbJIbcKWiPZu9s/jIzGf8wrQyE8do4pc +uny7LKGTPIE350pyTMdJwV8FmXrbQHP3kZiFBjqtHxqsEHY1XAScdu1Q7oBgxfGot0U KJbw== X-Forwarded-Encrypted: i=2; AJvYcCUl0eVDpzHg7CwxZjk98lgbFq5BHU9JTrver5RN1UgZZaKXShyOy/z1VkYmtdV/pwiPwwe4S87me+/+TXgILgBlRdoJUo/oIB9Rvz3i8z1++7wwZfeNgXvJdL63WQ== X-Gm-Message-State: AOJu0Yxw7ZqXGtMtiDj5lALkcFJPHiHC5W74jyVcRQt6HN53a49ZRJrW bse1sYKwRMWeaC+EvYc9xdXiyNJCkHTIMg0MuOGUJLY6EG47FToIGIjKJEmd1jtRBw== X-Google-Smtp-Source: AGHT+IGLO5Vu6M3tZgPJrePz6woZbmZ3PtcWCxvmo91ku+9+ygZMMOGxOGvnk8GTFhIi/Ki+pYalIA== X-Received: by 2002:a05:6402:3496:b0:58c:b2b8:31b2 with SMTP id 4fb4d7f45d1cf-58e7bad7d2emr7299480a12.17.1720370768198; Sun, 07 Jul 2024 09:46:08 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1d2e:b0:58b:d414:30d1 with SMTP id 4fb4d7f45d1cf-58e20380b9fls1827992a12.0.-pod-prod-00-eu; Sun, 07 Jul 2024 09:46:07 -0700 (PDT) X-Received: by 2002:a17:906:c14b:b0:a77:d9b5:ad4b with SMTP id a640c23a62f3a-a77d9b5db0cmr621006466b.9.1720370766813; Sun, 07 Jul 2024 09:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720370766; cv=none; d=google.com; s=arc-20160816; b=Qmy0zJGOz6WhYEENCUUXgh4DVtPczVS3pq50au1NgChYOOkh8FLkl9r7UvCRX+2KJv of5fWMlp0XiHjNwg25dT1lVcfpckriPV6hVxMM9M/sMt6mnd2EuGlMkyXj7FoCNXo0OY ZAg0vfEEEny1Tt3EUZmUfxQh7ELMbEVvZ+dthXiraHjiSoXprz8EOLT1CgNDdNFBmczM zaeIZSKNu5ULVaYerJf/rXyX/eO5iCY25mBzbbURnHaENk96JSb9j2NxkSyzRrfhhkXH kdBITZmVPtQZQL0tNtP30qPeESrucN9vkGiUNldn20xnvhIy9ZO2BLYlIPDUvif/876A 6dug== 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=temUnmidK43wx2L9tvz6DwIxcl1zHZwNQrDc5X0+e6c=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=c3r31jyFzichM3c4vEQDr5q8lC2yHL3uCGeFr2Pq4k8c66iMijqfWaKSFdAC5IZw4D upJAjqc9R2+h6uqciGLmvAq3amD5OcSkdmHZ+rA9fbTQx8djy1bTKATJSoLPP58bTa9d UrFTA8feugVFatmbPJuY1LmyLnxC1PipRz4XNo5atLDO7yzaQqrcC13bohiI6DEC6M9y pMSrajqGV/kYC0/yQlyMUetDWmT4GQj6WZV/qxzbkdzmZ8ltLnRY/CsPmSQPUxCeywnO 1iih9ttG1Gods8UzY+n4cosm0ujscfye50czem7ZoA7Sl8ctx146vjr6tKq2MmUpDloo jzsg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LzDlS32I; 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-a77b7a7d82bsor239390066b.7.2024.07.07.09.46.06 for (Google Transport Security); Sun, 07 Jul 2024 09:46:06 -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:907:9953:b0:a72:64f0:552e with SMTP id a640c23a62f3a-a77bda06ae2mr665270066b.19.1720370766361; Sun, 07 Jul 2024 09:46:06 -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-a77be903eb6sm298715466b.23.2024.07.07.09.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:46:06 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/mediastreamer: fix patch fuzz Date: Sun, 7 Jul 2024 18:46:02 +0200 Message-ID: <20240707164602.320774-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=LzDlS32I; 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, mediastreamer fails to build with output: Applying 0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch using patch: patching file src/utils/ffmpeg-priv.h Hunk #1 FAILED at 102. 1 out of 1 hunk FAILED -- saving rejects to file src/utils/ffmpeg-priv.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch index fc66e9a9f92d..9fd3fda2eccd 100644 --- a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +++ b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch @@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 Signed-off-by: Bernd Kuhls [Fabrice: updated for 4.3.1] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/utils/ffmpeg-priv.h | 4 ++++ src/videofilters/nowebcam.c | 4 ++-- @@ -28,8 +30,8 @@ diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h index c0745a9a..d59ea0e1 100644 --- a/src/utils/ffmpeg-priv.h +++ b/src/utils/ffmpeg-priv.h -@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - #endif +@@ -115,6 +115,10 @@ + extern "C" { #endif +#ifndef AV_INPUT_BUFFER_PADDING_SIZE