From patchwork Wed May 22 07:02:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3116 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 6EA083F9F8 for ; Wed, 22 May 2024 09:02:58 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5729d8798a4sf450776a12.0 for ; Wed, 22 May 2024 00:02:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361378; cv=pass; d=google.com; s=arc-20160816; b=HBEdtpAjzAvJnojS6v4vfqKLelyXSkMi/9q3dv0EASzwSAyR3OBoqnKqwx+mu0Uop4 E/2D0ux3EhnlDEnC2MVFOLLaUej03Dlb27cMq49sTW1PhdRV7C8AOWARbBfmzFUPwS/P mub9vsqZslM8Kokk/bZK7Wq3FM8JliMUKtAXUE5BNfFPTmrWhPUg4HUJ3kP0Xh34zKIt aPPwGjCDADhpaYLuNRlsgPJOlegPE/zqHEIDD9pwmZB3UEUlF9PpFuGCmz6A5VHdCe/c IPgjbKvHQvSmIFax01XXB88Q3uDjF9/CSwwegzGvwKCoInCux4T6ge5bpYzQHg53Z0+Y mmcA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; fh=EcjFIrzLS6ReRVobNKt7v7FRuSS8sauzZngnJgIPhK4=; b=LDTIpKA4o+fc60tJBA4meZqUGTbkd49d7nJSgNwh33AjLYVVHyukdisQQOUbnEvL3W WcFKcOWNBgqBwDHFw2sPbDKHvWIjlhB/4Kq9B8da3HSgxx0si2bqz5KWdJJgcU/uZ23g OnagafEWSy247fm/BVZ/WLiN77afc2tsm2LAVI1OQ4UzURk3etTRy+qusMhv1K/z6Seb uiMfKWTF9HT3GTw+jDUjx0rvIxZyet8+iThU2An2aT01rgBAmfYWxGeRrDvWc57bn3rS vspUYpSiSKZwhEvEFZ3KQdC/MIdmBZ0qtjOzWYbzw4rHp6KXbFi+rL4d+NabDTQ153k7 FvYg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=muWJO33+; 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=1716361378; x=1716966178; 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:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; b=e9gJ2BYOUfaeztKHW45wOkfttSAdzbN+ywSfteuSnqEB5Dz58mPdt9npGHnFzTUsHg vS5HPUCRxGYRN5uLnZWe8hTm+dlr+Y5xLM85CFuE4r9QwHsff1gy6Ioq94KDzkPdNeui 1JfittRS0Vcaprs0JEIXmEgIGvUe3LytB0ilQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361378; x=1716966178; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; b=BvsFKl5lr8pDXK+NMpe7xw76vndUvCsN4nYnnkVBuyglyPRdLofEmY1q7gwWIwAdRy Bz00UM9tTfP6F9Lf0RRzpO3HtPE3gLj0Kiv2dSFIFK/sDoTFGa4tnHCtwOtRwQVumm60 pqxFCatfr+WCPHL6O/ZgQ4ewH6tt6aYGa7xGdJTejl6o86fWQQ4UJcKG/hytuDj/X0kx PaMmj03D4bNfaG52+V2Hi+OUJRiJtFi04BRMoGA6jEEgfD5rpV1cPKT8zlJOKdjMWErm 2s7St6bDDKPH5BfRL3zGRBsBPEL3+RLE3/5jPskMwqxfo0fUcbWDbxYBr1FdTxEUEVRa F+rQ== X-Forwarded-Encrypted: i=2; AJvYcCUJhKxolgw21v+Zebcosi2jXTgUre1eiHRleSCpFOgclmC3kAW10gLl+aR1chpdHD8dJFokBESqZ8BfgyDv13x4NjInqRgpcFLvQ7GPyE5lGwhk3KAAdOwD1D8+HQ== X-Gm-Message-State: AOJu0YwHPZmdtg+mr5/Om7vt2SwGJj+2LLvu3PwOaBUY9T++d1nHWZKb M9ceb08HBu/e+nPj4ZluV7buppF27OtRnXMv/U8j/+Zmhp7MnUsr58N1/bZ5F8RGTQ== X-Google-Smtp-Source: AGHT+IE2ulzaX+l0hXSVp1Ov80j8PlZwlwrPUIUgID1JpYiH7WrKJo7s7ebaKaVUwKGrj/qaWQbMKQ== X-Received: by 2002:a05:6402:26c5:b0:578:3356:e7b5 with SMTP id 4fb4d7f45d1cf-5783356ee21mr771811a12.2.1716361377883; Wed, 22 May 2024 00:02:57 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:2424:b0:572:6ddc:bb0f with SMTP id 4fb4d7f45d1cf-573332d9f22ls391031a12.1.-pod-prod-03-eu; Wed, 22 May 2024 00:02:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRRo6Xd6j532FosSimDEi2wUWV8pi9FTYdQvc8q8EOYrUs+jlOg+uIHvKZB4vgj+3kLbYuoA4O3IuitbNwn8869wSIj96RhdbaO7fd8qAluLJO X-Received: by 2002:a50:f60c:0:b0:572:9474:5959 with SMTP id 4fb4d7f45d1cf-578329a2962mr693304a12.8.1716361375872; Wed, 22 May 2024 00:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361375; cv=none; d=google.com; s=arc-20160816; b=tJAzxbLLb611DNb4ESlF8tYVQin6j7wKOEHN6+of4AscCtMDyft9DrxLRr8ps/11jM p98GbE/i2Sf7sZfZmZo1w4QYiSjCyBsOC45xl+24boqfB7HJih4PBGNGQfBPUlzTJqvo yFf+U6Jl3URqbrMh+Ru+M0YtoFvWlr39xe+6EYOkLdXlPoUH2LXn3rltI3zRT8fzXYn3 eL6gpvoHfuwj+TO0Hv1CWEpyNqUpUqQTKQpQEcXqDEWKdCCoPEjUgLVV5EbcPRaTuJHL vDwu/ghJST648s4K83xFBkiPa12uIj9NvVlbu4G3AYvA5z+Z7i9cNK4nSVU19Hv3IoHM PMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Xy4QsZm2SYUeuV6G19FalMhtlljLNyJh35rn7tGLDys=; fh=PXen9sccNYesltfJ0o7bto4K+dkvZwFy2A8TsPG4RCM=; b=HjuJQJdkBowQ1uzqPWy5CnlcHmeAz/ySAAuasYXyLh/oC1y360VveW73McUXt+cTk9 KFjt8y46i2+SemD+dpvLlcaEC+UAsHXDB8YYDI3RDsQNMgtKMsMx/rK5gTlb9cxbU9eB 1xXEsXZ5x3GFS5FiWkUGGtHHa0ZCv0kUyGfpufs/8My2S0pWCRRJmoHUpI8XYacASgv5 AqcyQkN+zrkip7YI3Eq9H64h74n0YeJwlRoUiqoelMD+s56I7K828Vz+6nbeIHYkduDg y5WAmKXkEMHlhNRiM7jmqBAx5k9qVyZH+k5guR/ZzV46ueEoW3YaJ41OevR2aL5Y0pPD 4kjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=muWJO33+; 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 4fb4d7f45d1cf-5733c2d563fsor6953073a12.12.2024.05.22.00.02.55 for (Google Transport Security); Wed, 22 May 2024 00:02:55 -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; AJvYcCWBb8VbrfpvNCMGWXiZ7U1/P9EWXU0ZdA5hgtAqc7JWW13TE75UFOUj58glDNO5VxViLTKrVEMIDo4/w4j2GWvXbkpLRWfgI643NozYFCFZvKjR X-Received: by 2002:a50:c09a:0:b0:572:6f3d:7208 with SMTP id 4fb4d7f45d1cf-57832be63eamr762700a12.29.1716361375525; Wed, 22 May 2024 00:02:55 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:55 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 07/18] package/ffmpeg: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:26 +0200 Message-ID: <20240522070238.3282121-8-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> 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=muWJO33+; 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: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../ffmpeg/0003-libavutil-Fix-mips-build.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index ee2d1db8bdf8..a52d7fc347b4 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -1,4 +1,4 @@ -From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001 +From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Jun 2021 08:54:53 +0200 Subject: [PATCH] libavutil: Fix mips build @@ -11,16 +11,18 @@ Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure | 2 ++ libavutil/mips/cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 6bfd98b384..773a7d516c 100755 +index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure -@@ -2191,6 +2191,7 @@ HEADERS_LIST=" +@@ -2227,6 +2227,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa - check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa + check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h +check_headers sys/auxv.h @@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 100755 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c -index 59619d54de..19196de50b 100644 +index 59619d54dee3..19196de50b59 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -19,7 +19,7 @@ @@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644 return cpu_flags_cpucfg(); else -- -2.29.2 +2.34.1