[Ffmpeg-devel] [PATCH] configure - simplify

[Ramiro Polla]

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 cp 
configure configure.1, edited configure and diff -u configure.1 configure
This is in MinGW, so the reason for the DOS linebreaks.

Sorry, it's just that I don't know much how to use svn. It would be 
simpler if I could apply the patch locally, and svn diff subsequente 
patches. How can I do that?

Attached new patch made with svn diff.

Ramiro Polla
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: else.diff
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070206/2e4084e0/attachment.txt>