[MPlayer-dev-eng] [PATCH] '-priority' support on OS/2

KO Myung-Hun komh at chollian.net
Tue Feb 10 16:48:57 CET 2009


Hi/2.

Diego Biurrun wrote:
> On Wed, Feb 11, 2009 at 12:18:13AM +0900, KO Myung-Hun wrote:
>   
>> Diego Biurrun wrote:
>>     
>>> On Mon, Feb 09, 2009 at 10:30:26PM +0900, KO Myung-Hun wrote:
>>>
>>> Your patch does not apply:
>>>
>>> diego at cerebus:~/src/mplayer/mplayer$ patch --dry-run -p0 -i 
>>> /tmp/priority.diff patching file Makefile
>>> patching file configure
>>> patching file DOCS/man/en/mplayer.1
>>> patching file mplayer.c
>>> Hunk #2 FAILED at 2596.
>>> 1 out of 2 hunks FAILED -- saving rejects to file mplayer.c.rej
>>> patching file osdep/priority.c
>>> patching file osdep/priority.h
>>> patching file cfg-common.h
>>> patching file cfg-common-opts.h
>>> Hunk #1 succeeded at 3 with fuzz 2.
>>> Hunk #2 FAILED at 19.
>>> 1 out of 2 hunks FAILED -- saving rejects to file cfg-common-opts.h.rej
>>> patching file mencoder.c
>>> Hunk #2 FAILED at 481.
>>> 1 out of 2 hunks FAILED -- saving rejects to file mencoder.c.rej
>>>       
>> Hmm... I've updated the patch based on latest revision.
>>     
>
> diego at cerebus:~/src/mplayer/mplayer$ patch --dry-run -p0 -i /tmp/priority.diff 
> patching file Makefile
> patching file configure
> patching file DOCS/man/en/mplayer.1
> patching file mplayer.c
> Hunk #2 FAILED at 2598.
> 1 out of 2 hunks FAILED -- saving rejects to file mplayer.c.rej
> patching file osdep/priority.c
> patching file osdep/priority.h
> patching file cfg-common.h
> patching file cfg-common-opts.h
> Hunk #1 succeeded at 3 with fuzz 2.
> Hunk #2 FAILED at 19.
> 1 out of 2 hunks FAILED -- saving rejects to file cfg-common-opts.h.rej
> patching file mencoder.c
> Hunk #2 FAILED at 481.
> 1 out of 2 hunks FAILED -- saving rejects to file mencoder.c.rej
>
> Something is wrong with your setup.  I could apply the patch when I
> added -l to the patch command line.  Did you maybe add DOS linebreaks?
>
>   

I did as always but updated SVN client to 1.5.5 from 1.4.4. And my text 
editor always used CR/LF.

Hmm... Strange... Anyway thanks a lot for some hints.

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 1.1.14
Under OS/2 Warp 4 for Korean with FixPak #15
On AMD ThunderBird 1 GHz with 512 MB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr





More information about the MPlayer-dev-eng mailing list