vdr-1.4.6-liemikuutio-1.13.diff

  • Hallo,


    ich bekommen den obigen Patch nicht eingespielt.


    Nach dem Patchen bricht das kompilieren ab....siehe unten.


    Hat jemand einen Tipp für mich??


    Soeben habe ich vdradmin-am-3.6.0 ans laufen gebracht, jedoch kann ich ohne dem obigen Patch keine Aufnahmen umbenennen.


    Bisweilen habe ich die Sourcen des VDR-1-4-6 gepatched mit:
    - vdr-1.4.4-2-LiveBuffer-0.1.8.diff
    - dvd-0.3.5-b07-speedcontrol.diff



    Danke






    PATCHEN:


    ##################################################
    vdr:/usr/src/vdr/VDR# patch < vdr-1.4.6-liemikuutio-1.13.diff


    patching file HISTORY-liemikuutio
    patching file config.c
    Hunk #1 succeeded at 284 (offset 9 lines).
    Hunk #2 succeeded at 459 (offset 18 lines).
    Hunk #3 succeeded at 541 (offset 27 lines).
    patching file config.h
    Hunk #1 succeeded at 37 with fuzz 2 (offset 2 lines).
    Hunk #2 succeeded at 265 (offset 11 lines).
    patching file i18n.c
    Hunk #1 succeeded at 6324 (offset 198 lines).
    patching file menu.c
    Hunk #2 FAILED at 665.
    Hunk #3 succeeded at 737 (offset 18 lines).
    Hunk #4 FAILED at 1044.
    Hunk #5 succeeded at 1101 (offset 64 lines).
    Hunk #6 succeeded at 1125 with fuzz 2 (offset 65 lines).
    Hunk #7 FAILED at 1149.
    Hunk #8 succeeded at 1193 (offset 68 lines).
    Hunk #9 succeeded at 1205 (offset 68 lines).
    Hunk #10 succeeded at 1934 (offset 72 lines).
    Hunk #11 succeeded at 1951 (offset 72 lines).
    Hunk #12 succeeded at 2330 (offset 72 lines).
    Hunk #13 succeeded at 2355 (offset 72 lines).
    Hunk #14 succeeded at 2462 (offset 72 lines).
    Hunk #15 succeeded at 2539 (offset 72 lines).
    Hunk #16 succeeded at 2855 with fuzz 1 (offset 72 lines).
    Hunk #17 FAILED at 3161.
    Hunk #18 succeeded at 3227 (offset 124 lines).
    Hunk #19 succeeded at 3250 (offset 124 lines).
    Hunk #20 FAILED at 4515.
    5 out of 20 hunks FAILED -- saving rejects to file menu.c.rej
    patching file menu.h
    Hunk #1 succeeded at 37 with fuzz 1 (offset 2 lines).
    Hunk #2 succeeded at 177 (offset 4 lines).
    patching file menuitems.c
    patching file menuitems.h
    patching file osdbase.c
    patching file osdbase.h
    Hunk #1 succeeded at 96 (offset 2 lines).
    patching file recording.c
    Hunk #7 succeeded at 889 (offset 10 lines).
    Hunk #8 FAILED at 1236.
    1 out of 8 hunks FAILED -- saving rejects to file recording.c.rej
    patching file recording.h
    Hunk #2 succeeded at 86 with fuzz 2 (offset 1 line).
    Hunk #3 succeeded at 100 (offset 1 line).
    patching file svdrp.c
    patching file svdrp.h
    vdr:/usr/src/vdr/VDR#
    ##################################################





    KOMPILIEREN:


    ##################################################
    vdr:/usr/src/vdr/VDR# make clean
    (fehlt)
    vdr:/usr/src/vdr/VDR# make clean-plugins
    (fehlt)
    vdr:/usr/src/vdr/VDR# make
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" audio.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" channels.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" ci.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" config.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" cutter.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" device.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" diseqc.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" dvbdevice.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" dvbosd.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" dvbplayer.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" dvbspu.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" eit.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" eitscan.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" epg.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" filter.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" font.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" i18n.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" interface.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" keys.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" lirc.c
    g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DREMOTE_NO_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\" menu.c
    menu.c:1089: error: prototype for 'cMenuScheduleItem::cMenuScheduleItem(const cEvent*, cChannel*, bool, bool)' does not match any in class 'cMenuScheduleItem'
    menu.c:1069: error: candidates are: cMenuScheduleItem::cMenuScheduleItem(const cMenuScheduleItem&)
    menu.c:1079: error: cMenuScheduleItem::cMenuScheduleItem(const cEvent*, cChannel*, bool)
    menu.c: In constructor 'cMenuScheduleItem::cMenuScheduleItem(const cEvent*, cChannel*, bool, bool)':
    menu.c:1095: error: 'withBar' was not declared in this scope
    menu.c: In constructor 'cMenuWhatsOn::cMenuWhatsOn(const cSchedules*, bool, int)':
    menu.c:1186: error: no matching function for call to 'cMenuScheduleItem::cMenuScheduleItem(const cEvent*&, cChannel*&, bool, bool&)'
    menu.c:1079: note: candidates are: cMenuScheduleItem::cMenuScheduleItem(const cEvent*, cChannel*, bool)
    menu.c:1069: note: cMenuScheduleItem::cMenuScheduleItem(const cMenuScheduleItem&)
    make: *** [menu.o] Fehler 1
    vdr:/usr/src/vdr/VDR#
    ##################################################



    Mir sagt das hier garnix...
    "Fehler 1" klingt aber verdächtig :)



    Gruß
    Hottenmax

  • Hi,


    Zitat

    5 out of 20 hunks FAILED


    da ist das patchen schon schiefgelaufen. Das Compilieren klappt somit nicht mehr. Hast Du zuvor vielleicht schon andere Patches eingespielt? Evtl. beißt sich der liemikuutio damit. Also am besten noch mal frisch mit VDR auspacken anfangen und bei den patches am besten immer erst mit


    patch --dry-run ...


    testen, ob der Patch überhaupt funktionieren wird.
    Evtl. auch mal die Reihenfolge der Patches umdrehen, kann auch helfen.


    Tschüss,


    winni

  • Also....


    Tatsache ist, das der LIVE-Buffer Patch ebenfalls die menu.c patched.


    Es sieht doch sehr danach auch, dass hier das Problem ist....



    vdr-1.4.4-2-LiveBuffer-0.1.8.diff:


    ##########################################
    vdr:/usr/src/TESTVDR/vdr-1.4.6# patch --dry-run < vdr-1.4.4-2-LiveBuffer-0.1.8.diff
    patching file config.c
    patching file config.h
    patching file cutter.c
    patching file cutter.h
    patching file device.c
    patching file device.h
    patching file dvbdevice.c
    Hunk #1 succeeded at 379 (offset -1 lines).
    Hunk #2 succeeded at 434 (offset -1 lines).
    Hunk #3 succeeded at 819 (offset -1 lines).
    Hunk #4 succeeded at 1184 (offset -1 lines).
    Hunk #5 succeeded at 1195 (offset -1 lines).
    patching file dvbdevice.h
    patching file dvbplayer.c
    patching file dvbplayer.h
    patching file i18n.c
    patching file keys.c
    patching file keys.h
    patching file menu.c
    patching file menu.h
    patching file osdbase.h
    patching file player.h
    patching file README.LiveBuffer
    patching file receiver.c
    patching file receiver.h
    patching file recorder.c
    patching file recorder.h
    patching file recording.c
    patching file recording.h
    patching file ringbuffer.c
    patching file timers.h
    patching file transfer.c
    patching file transfer.h
    patching file vdr.c
    patching file videodir.c
    patching file videodir.h
    vdr:/usr/src/TESTVDR/vdr-1.4.6#
    #########################################






    #########################################
    vdr:/usr/src/TESTVDR/vdr-1.4.6# patch --dry-run < vdr-1.4.6-liemikuutio-1.13.diff
    patching file HISTORY-liemikuutio
    patching file config.c
    patching file config.h
    patching file i18n.c
    patching file menu.c
    patching file menu.h
    patching file menuitems.c
    patching file menuitems.h
    patching file osdbase.c
    patching file osdbase.h
    patching file recording.c
    patching file recording.h
    patching file svdrp.c
    patching file svdrp.h
    vdr:/usr/src/TESTVDR/vdr-1.4.6#
    #########################################




    Nachdem einer von beiden ohne --dry-run ausgeführt wurde sieht das Ergebnis des anderen deutlich schlecher aus.


    Den Live-Buffer nutze ich oft.
    Daher werde ich mir den liemikuutio wohl schenken......


    Danke


    Gruß
    Hottenmax

Jetzt mitmachen!

Sie haben noch kein Benutzerkonto auf unserer Seite? Registrieren Sie sich kostenlos und nehmen Sie an unserer Community teil!