[oe] [STABLE][PATCH] gegl: fix CR+LF newlines in the patch, as it fails to apply
Denys Dmytriyenko
denis at denix.org
Fri Apr 10 04:04:06 UTC 2009
On Thu, Apr 09, 2009 at 11:53:28PM -0400, Denys Dmytriyenko wrote:
>
> Signed-off-by: Denys Dmytriyenko <denis at 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
More information about the Openembedded-devel
mailing list