[Ffmpeg-devel] [PATCH] configure - simplify
Wed Feb 7 09:49:54 CET 2007
> Diego Biurrun wrote:
> > On Tue, Feb 06, 2007 at 04:14:14AM -0200, ramiro at lisha.ufsc.br
> > wrote:
> >> else.diff changes occurences of "if;then <1 line> else <1 line>
> > > fi" to &&
> >> and ||
> > cerebus:~/src/ffmpeg/ffmpeg$ patch --dry-run -p0 -i /tmp/else.diff
> > patching file configure
> > Hunk #1 FAILED at 1259.
> > Hunk #2 FAILED at 1297.
> > Hunk #3 FAILED at 1413.
> > Hunk #4 FAILED at 1423.
> > Hunk #5 FAILED at 1466.
> > Hunk #6 FAILED at 1528.
> > Hunk #7 FAILED at 1889.
> > Hunk #8 FAILED at 1910.
> > Hunk #9 FAILED at 1927.
> > Hunk #10 FAILED at 2039.
> > Hunk #11 FAILED at 2058.
> > 11 out of 11 hunks FAILED -- saving rejects to file configure.rej
> > What do you create your patches with? They're always full of DOS
> > linebreaks ...
> The first patch I create with svn diff. For subsequent patches I did
> configure configure.1, edited configure and diff -u configure.1
> This is in MinGW, so the reason for the DOS linebreaks.
It's not that hard for either sender or applier to just pipe it through
tr -d '\r'
Just my $((2*0.01)) cents.
More information about the ffmpeg-devel