Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Denys Dmytriyenko <denis@denix.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [STABLE][PATCH] gegl: fix CR+LF newlines in the patch, as it	fails to apply
Date: Fri, 10 Apr 2009 00:04:06 -0400	[thread overview]
Message-ID: <20090410040406.GA28306@denix.org> (raw)
In-Reply-To: <1239335608-11080-1-git-send-email-denis@denix.org>

On Thu, Apr 09, 2009 at 11:53:28PM -0400, Denys Dmytriyenko wrote:
> 
> Signed-off-by: Denys Dmytriyenko <denis@denix.org>

Ah, as I thought - CR+LF newlines were lost somewhere in the MTA/MUA 
transfer...

But, if anybody cares, you can download the patch by wget and examine it in 
hexview :)

$ wget 'http://cgit.openembedded.net/cgit.cgi?url=openembedded/patch/&id=51893f23d9ec8ba94d9a29be7da3914bf2259eaf' -O gegl-newlines.patch

Not sure why my quilt/patch fails to apply the patch with CR+LF newlines 
though, as it appears to work fine for others.


> ---
>  recipes/gimp/gegl/gegl-resilience.patch |   22 +++++++++++-----------
>  1 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/recipes/gimp/gegl/gegl-resilience.patch b/recipes/gimp/gegl/gegl-resilience.patch
> index 0e35dd5..70424ec 100644
> --- a/recipes/gimp/gegl/gegl-resilience.patch
> +++ b/recipes/gimp/gegl/gegl-resilience.patch
> @@ -1,11 +1,11 @@
> ---- trunk/operations/external/ff-load.c	2008-12-20 13:37:05.000000000 -0800
> -+++ trunk/operations/external/ff-load.c	2008-12-20 13:37:22.000000000 -0800
> -@@ -278,7 +278,7 @@
> -       p->enc = p->video_st->codec;
> -       p->codec = avcodec_find_decoder (p->enc->codec_id);
> - 
> --      p->enc->error_resilience = 2;
> -+      p->enc->error_recognition = 2;
> -       p->enc->error_concealment = 3;
> -       p->enc->workaround_bugs = FF_BUG_AUTODETECT;
> - 
> +--- trunk/operations/external/ff-load.c	2008-12-20 13:37:05.000000000 -0800
> ++++ trunk/operations/external/ff-load.c	2008-12-20 13:37:22.000000000 -0800
> +@@ -278,7 +278,7 @@
> +       p->enc = p->video_st->codec;
> +       p->codec = avcodec_find_decoder (p->enc->codec_id);
> + 
> +-      p->enc->error_resilience = 2;
> ++      p->enc->error_recognition = 2;
> +       p->enc->error_concealment = 3;
> +       p->enc->workaround_bugs = FF_BUG_AUTODETECT;
> + 
> -- 
> 1.6.0.6



  reply	other threads:[~2009-04-10  4:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-10  3:53 [STABLE][PATCH] gegl: fix CR+LF newlines in the patch, as it fails to apply Denys Dmytriyenko
2009-04-10  4:04 ` Denys Dmytriyenko [this message]
2009-04-14  7:54   ` Koen Kooi
2009-04-14 21:31     ` Denys Dmytriyenko

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=20090410040406.GA28306@denix.org \
    --to=denis@denix.org \
    --cc=openembedded-devel@lists.openembedded.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox