[MPlayer-dev-eng] [PATCH] ao_dart

[Dave Yeo]

On 02/26/09 04:12 am, KO Myung-Hun wrote:
>
>> Please make sure your patches really apply.
>>
>
> Strange, it works fine here.

It's probably a line ending issue,
with DOS line endings.

I:\usr\src\MPlayer >patch --dry-run -p0 < dart.diff
patching file `libao2/ao_dart.c'
patching file `libao2/audio_out.c'
patching file `Makefile'
Hunk #1 succeeded at 546 (offset 1 line).
patching file `configure'
Hunk #1 succeeded at 416 (offset 1 line).
Hunk #2 succeeded at 590 (offset 1 line).
Hunk #3 succeeded at 961 (offset 3 lines).
Hunk #4 succeeded at 5674 with fuzz 1 (offset 31 lines).
Hunk #5 succeeded at 8108 (offset 7 lines).
Hunk #6 succeeded at 8576 (offset 33 lines).
patching file `Changelog'
Hunk #1 succeeded at 99 (offset 1 line).
patching file `DOCS/man/en/mplayer.1'

patch --binary --dry-run -p0 < dart.diff
patching file `libao2/ao_dart.c'
patching file `libao2/audio_out.c'
patching file `Makefile'
Hunk #1 succeeded at 546 (offset 1 line).
patching file `configure'
patch: **** malformed patch at line 386:

With Unix line endings,

I:\usr\src\MPlayer >patch --binary --dry-run -p0 < dart.diff
patching file `libao2/ao_dart.c'
patching file `libao2/audio_out.c'
Hunk #1 FAILED at 47.
Hunk #2 FAILED at 64.
2 out of 2 hunks FAILED -- saving rejects to libao2/audio_out.c#
patching file `Makefile'
Hunk #1 FAILED at 545.
1 out of 1 hunk FAILED -- saving rejects to Makefile.rej
patching file `configure'
Hunk #1 FAILED at 415.
Hunk #2 FAILED at 589.
Hunk #3 FAILED at 958.
Hunk #4 FAILED at 5643.
Hunk #5 FAILED at 8101.
Hunk #6 FAILED at 8543.
6 out of 6 hunks FAILED -- saving rejects to configure.rej
patching file `Changelog'
Hunk #1 FAILED at 98.
1 out of 1 hunk FAILED -- saving rejects to Changelog.rej
patching file `DOCS/man/en/mplayer.1'
Hunk #1 FAILED at 2836.
1 out of 1 hunk FAILED -- saving rejects to DOCS/man/en/mplayer.1.rej

I:\usr\src\MPlayer >patch --dry-run -p0 < dart.diff
patching file `libao2/ao_dart.c'
patching file `libao2/audio_out.c'
patching file `Makefile'
Hunk #1 succeeded at 546 (offset 1 line).
patching file `configure'
Hunk #1 succeeded at 416 (offset 1 line).
Hunk #2 succeeded at 590 (offset 1 line).
Hunk #3 succeeded at 961 (offset 3 lines).
Hunk #4 succeeded at 5674 with fuzz 1 (offset 31 lines).
Hunk #5 succeeded at 8108 (offset 7 lines).
Hunk #6 succeeded at 8576 (offset 33 lines).
patching file `Changelog'
Hunk #1 succeeded at 99 (offset 1 line).
patching file `DOCS/man/en/mplayer.1'

Surprising the variety of results depending on line endings and --binary.
Dave