Mailing List archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[vdr] 2 or more Patches for VDR ?? - How to do...



Hi all

I use now the 0.96 version of VDR and i want to use several patches:

- MP3 Patch
- LCD-Patch
- perhaps others too

So - i "make clean" in VDR directory and apply the first patch:

patch -i vdr-0.96-LCDproc.23.09.01.diff   <- for LCD

works without any Problem - i can compile VDR and run it...

again make clean
and then the other Patch:

patch -i vdr-0.96-mp3-7.diff    <-  for MP3

also works fine - i can compile and listen MP3 ... fine :-)

But if i want to use both patches - i get such error-Messages:

patching file dvbapi.h
patching file i18n.c
patching file menu.c
Hunk #1 succeeded at 20 with fuzz 2 (offset 3 lines).
Hunk #2 succeeded at 1845 (offset 21 lines).
Hunk #3 succeeded at 1897 (offset 21 lines).
patching file mp3.c
patching file mp3.h
patching file osd.c
Hunk #1 succeeded at 159 (offset 11 lines).
patching file osd.h
patching file tools.c
patching file tools.h
patching file vdr.c
Hunk #1 FAILED at 41.
Hunk #2 FAILED at 104.
Hunk #3 succeeded at 167 with fuzz 1 (offset 14 lines).
Hunk #4 succeeded at 184 with fuzz 2 (offset 18 lines).
Hunk #5 succeeded at 235 (offset 21 lines).
Hunk #6 succeeded at 478 (offset 40 lines).
2 out of 6 hunks FAILED -- saving rejects to file vdr.c.rej

How can i apply more then one patch to VDR ?
Does anyone know how to do this ?

Thanks

Axel




Home | Main Index | Thread Index