All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/libyuv: update patches to be applied with fuzz 0
Date: Sun, 30 Jun 2024 11:30:58 +0200	[thread overview]
Message-ID: <ZoEl0jaExXsymmzD@landeda> (raw)
In-Reply-To: <20240629073102.772416-1-bernd@kuhls.net>

Bernd, All,

On 2024-06-29 09:31 +0200, Bernd Kuhls spake thusly:
> Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0" reduced the fuzz factor.
> 
> Due to this change, libyuv fails to build with output:
> 
>     Applying 0001-i386-sse2.patch using patch:
>     patching file include/libyuv/scale_row.h
>     Hunk #1 FAILED at 33.
>     1 out of 1 hunk FAILED -- saving rejects to file include/libyuv/scale_row.h.rej
> 
> Rebase the patch to fix the problem.
> 
> Fixes:
> http://autobuild.buildroot.net/results/8ca446ee4bd657a661894dec66f45aa02b6a7325/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

> ---
>  package/libyuv/0001-i386-sse2.patch | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libyuv/0001-i386-sse2.patch b/package/libyuv/0001-i386-sse2.patch
> index b8ecb34d0f..2380bbc973 100644
> --- a/package/libyuv/0001-i386-sse2.patch
> +++ b/package/libyuv/0001-i386-sse2.patch
> @@ -5,7 +5,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>  diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h
>  --- libyuv-1411.org/include/libyuv/scale_row.h	2015-05-22 23:39:21.000000000 +0200
>  +++ libyuv-1411/include/libyuv/scale_row.h	2015-05-25 12:35:17.000000000 +0200
> -@@ -33,7 +33,7 @@
> +@@ -55,7 +55,7 @@
>   
>   // The following are available on all x86 platforms:
>   #if !defined(LIBYUV_DISABLE_X86) && \
> @@ -13,4 +13,4 @@ diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/
>  +    (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__)))
>   #define HAS_FIXEDDIV1_X86
>   #define HAS_FIXEDDIV_X86
> - #define HAS_SCALEADDROWS_SSE2
> + #define HAS_SCALEADDROW_SSE2
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      reply	other threads:[~2024-06-30  9:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-29  7:31 [Buildroot] [PATCH 1/1] package/libyuv: update patches to be applied with fuzz 0 Bernd Kuhls
2024-06-30  9:30 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZoEl0jaExXsymmzD@landeda \
    --to=yann.morin.1998@free.fr \
    --cc=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.