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

[Diego Biurrun]

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?

>>> --- configure	(revision 28494)
>>> +++ configure   (working copy)
>>> @@ -718,9 +722,11 @@
>>>  def_pthread_cache="#undef PTHREAD_CACHE"
>>> +def_priority="#undef CONFIG_PRIORITY"
>>
>> Set this to 0 here, then..
>>   
>>> --- mplayer.c	(revision 28494)
>>> +++ mplayer.c   (working copy)
>>> @@ -2594,17 +2596,12 @@
>>> +
>>> +#ifdef CONFIG_PRIORITY
>>> +    set_priority();
>>> +#endif
>>
>> .. you can use the following here:
>>
>>   if (CONFIG_PRIORITY)
>>       set_priority();
>
> What's the benefit from this ? And this require to compile  
> 'osdep/priority.c' unconditionally.
>
> I know, you rejected this approach. Nevertheless, should I do this ?

No, I will apply the patch as-is in a moment.

Diego