***** 0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch ***** PWD: /var/tmp/portage/media-video/vdr-1.7.21-r2/work/vdr-1.7.21 ========================================================================= PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < '/etc/portage/patches//media-video/vdr-1.7.21/0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch' ========================================================================= can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001 |From: Dominic Evans |Date: Fri, 23 Dec 2011 10:51:30 +0000 |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21 | |--- | Makefile | 5 + | config.c | 7 + | config.h | 4 + | device.c | 21 +++ | device.h | 4 + | dvbplayer.c | 51 ++++++++ | livebuffer.c | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | livebuffer.h | 47 +++++++ | menu.c | 248 +++++++++++++++++++++++++++++++++++- | menu.h | 22 +++ | osdbase.h | 3 + | player.c | 11 ++ | po/de_DE.po | 3 + | recorder.c | 10 ++ | recorder.h | 15 ++ | recording.h | 19 +++ | timers.c | 8 + | timers.h | 4 + | vdr.c | 52 ++++++++- | videodir.c | 18 +++ | videodir.h | 3 + | 21 files changed, 951 insertions(+), 7 deletions(-) | create mode 100644 livebuffer.c | create mode 100644 livebuffer.h | |diff --git a/Makefile b/Makefile |index 18d7eb9..bc49dac 100644 |--- a/Makefile |+++ b/Makefile -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 52 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.c b/config.c |index 73bb00d..14146a0 100644 |--- a/config.c |+++ b/config.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 88 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.h b/config.h |index c51e3df..1972195 100644 |--- a/config.h |+++ b/config.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 103 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.c b/device.c |index ba098d8..172f3b3 100644 |--- a/device.c |+++ b/device.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 151 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.h b/device.h |index fd587a8..2bebe89 100644 |--- a/device.h |+++ b/device.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 167 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dvbplayer.c b/dvbplayer.c |index 017df6d..800a31d 100644 |--- a/dvbplayer.c |+++ b/dvbplayer.c -------------------------- No file to patch. Skipping patch. 9 out of 9 hunks ignored patching file b/livebuffer.c patching file b/livebuffer.h can't find file to patch at input line 765 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.c b/menu.c |index ef2bb46..621d2ce 100644 |--- a/menu.c |+++ b/menu.c -------------------------- No file to patch. Skipping patch. 19 out of 19 hunks ignored can't find file to patch at input line 1181 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.h b/menu.h |index ec1c175..2d55470 100644 |--- a/menu.h |+++ b/menu.h -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1232 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/osdbase.h b/osdbase.h |index 91c5ff7..27c22b7 100644 |--- a/osdbase.h |+++ b/osdbase.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1246 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/player.c b/player.c |index 3490565..9aa2956 100644 |--- a/player.c |+++ b/player.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1275 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/po/de_DE.po b/po/de_DE.po |index 6d5b822..355348b 100644 |--- a/po/de_DE.po |+++ b/po/de_DE.po -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1289 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.c b/recorder.c |index a6cab47..70e4659 100644 |--- a/recorder.c |+++ b/recorder.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1325 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.h b/recorder.h |index 05cc42b..1d2aa04 100644 |--- a/recorder.h |+++ b/recorder.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1363 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recording.h b/recording.h |index 37979ec..52d57c8 100644 |--- a/recording.h |+++ b/recording.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1394 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.c b/timers.c |index 54ed1ba..c2298fa 100644 |--- a/timers.c |+++ b/timers.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1422 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.h b/timers.h |index 1d733ee..d35e042 100644 |--- a/timers.h |+++ b/timers.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1438 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/vdr.c b/vdr.c |index c32e45f..b9c4460 100644 |--- a/vdr.c |+++ b/vdr.c -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored can't find file to patch at input line 1542 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.c b/videodir.c |index 7331a85..14d4373 100644 |--- a/videodir.c |+++ b/videodir.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1589 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.h b/videodir.h |index 5e9aef5..57b8652 100644 |--- a/videodir.h |+++ b/videodir.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ========================================================================= PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '/etc/portage/patches//media-video/vdr-1.7.21/0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch' ========================================================================= patching file Makefile Hunk #1 succeeded at 65 (offset 5 lines). patching file config.c Hunk #1 succeeded at 407 with fuzz 1 (offset 10 lines). Hunk #2 succeeded at 627 with fuzz 1 (offset 34 lines). Hunk #3 succeeded at 778 with fuzz 1 (offset 85 lines). patching file config.h Hunk #1 succeeded at 315 with fuzz 2 (offset 27 lines). patching file device.c Hunk #2 succeeded at 701 (offset 36 lines). Hunk #3 succeeded at 830 (offset 100 lines). patching file device.h patching file dvbplayer.c Hunk #3 succeeded at 212 with fuzz 2 (offset 1 line). Hunk #4 FAILED at 281. Hunk #5 succeeded at 302 (offset 2 lines). Hunk #6 succeeded at 410 with fuzz 2 (offset 8 lines). Hunk #7 succeeded at 474 (offset 21 lines). Hunk #8 succeeded at 534 with fuzz 1 (offset 59 lines). Hunk #9 succeeded at 688 (offset 71 lines). 1 out of 9 hunks FAILED -- saving rejects to file dvbplayer.c.rej patching file livebuffer.c patching file livebuffer.h patching file menu.c Hunk #1 succeeded at 3366 with fuzz 2 (offset 323 lines). Hunk #2 succeeded at 3412 (offset 354 lines). Hunk #3 succeeded at 3424 with fuzz 1 (offset 354 lines). Hunk #4 FAILED at 4146. Hunk #5 succeeded at 4764 (offset 533 lines). Hunk #6 succeeded at 4849 (offset 543 lines). Hunk #7 succeeded at 4890 (offset 543 lines). Hunk #8 succeeded at 5143 (offset 550 lines). Hunk #9 succeeded at 5180 (offset 550 lines). Hunk #10 succeeded at 5320 (offset 550 lines). Hunk #11 succeeded at 5341 (offset 550 lines). Hunk #12 succeeded at 5366 (offset 552 lines). Hunk #13 succeeded at 5392 (offset 561 lines). Hunk #14 succeeded at 5419 (offset 561 lines). Hunk #15 succeeded at 5440 (offset 561 lines). Hunk #16 succeeded at 5474 (offset 561 lines). Hunk #17 succeeded at 5498 (offset 561 lines). Hunk #18 FAILED at 4975. Hunk #19 FAILED at 5014. 3 out of 19 hunks FAILED -- saving rejects to file menu.c.rej patching file menu.h Hunk #1 FAILED at 18. Hunk #2 succeeded at 240 (offset 4 lines). Hunk #3 succeeded at 260 (offset 4 lines). 1 out of 3 hunks FAILED -- saving rejects to file menu.h.rej patching file osdbase.h Hunk #1 succeeded at 35 (offset 2 lines). patching file player.c patching file po/de_DE.po patching file recorder.c patching file recorder.h patching file recording.h Hunk #1 succeeded at 275 (offset 11 lines). patching file timers.c patching file timers.h Hunk #1 succeeded at 44 (offset 1 line). patching file vdr.c Hunk #5 succeeded at 1128 (offset 17 lines). Hunk #6 succeeded at 1244 (offset 17 lines). patching file videodir.c Hunk #2 FAILED at 109. 1 out of 2 hunks FAILED -- saving rejects to file videodir.c.rej patching file videodir.h patch program exited with status 1 ========================================================================= PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < '/etc/portage/patches//media-video/vdr-1.7.21/0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch' ========================================================================= can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001 |From: Dominic Evans |Date: Fri, 23 Dec 2011 10:51:30 +0000 |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21 | |--- | Makefile | 5 + | config.c | 7 + | config.h | 4 + | device.c | 21 +++ | device.h | 4 + | dvbplayer.c | 51 ++++++++ | livebuffer.c | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | livebuffer.h | 47 +++++++ | menu.c | 248 +++++++++++++++++++++++++++++++++++- | menu.h | 22 +++ | osdbase.h | 3 + | player.c | 11 ++ | po/de_DE.po | 3 + | recorder.c | 10 ++ | recorder.h | 15 ++ | recording.h | 19 +++ | timers.c | 8 + | timers.h | 4 + | vdr.c | 52 ++++++++- | videodir.c | 18 +++ | videodir.h | 3 + | 21 files changed, 951 insertions(+), 7 deletions(-) | create mode 100644 livebuffer.c | create mode 100644 livebuffer.h | |diff --git a/Makefile b/Makefile |index 18d7eb9..bc49dac 100644 |--- a/Makefile |+++ b/Makefile -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 52 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.c b/config.c |index 73bb00d..14146a0 100644 |--- a/config.c |+++ b/config.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 88 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.h b/config.h |index c51e3df..1972195 100644 |--- a/config.h |+++ b/config.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 103 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.c b/device.c |index ba098d8..172f3b3 100644 |--- a/device.c |+++ b/device.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 151 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.h b/device.h |index fd587a8..2bebe89 100644 |--- a/device.h |+++ b/device.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 167 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dvbplayer.c b/dvbplayer.c |index 017df6d..800a31d 100644 |--- a/dvbplayer.c |+++ b/dvbplayer.c -------------------------- No file to patch. Skipping patch. 9 out of 9 hunks ignored can't find file to patch at input line 304 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.c b/livebuffer.c |new file mode 100644 |index 0000000..afc988d |--- /dev/null |+++ b/livebuffer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 713 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.h b/livebuffer.h |new file mode 100644 |index 0000000..8382d7d |--- /dev/null |+++ b/livebuffer.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 765 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.c b/menu.c |index ef2bb46..621d2ce 100644 |--- a/menu.c |+++ b/menu.c -------------------------- No file to patch. Skipping patch. 19 out of 19 hunks ignored can't find file to patch at input line 1181 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.h b/menu.h |index ec1c175..2d55470 100644 |--- a/menu.h |+++ b/menu.h -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1232 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/osdbase.h b/osdbase.h |index 91c5ff7..27c22b7 100644 |--- a/osdbase.h |+++ b/osdbase.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1246 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/player.c b/player.c |index 3490565..9aa2956 100644 |--- a/player.c |+++ b/player.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1275 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/po/de_DE.po b/po/de_DE.po |index 6d5b822..355348b 100644 |--- a/po/de_DE.po |+++ b/po/de_DE.po -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1289 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.c b/recorder.c |index a6cab47..70e4659 100644 |--- a/recorder.c |+++ b/recorder.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1325 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.h b/recorder.h |index 05cc42b..1d2aa04 100644 |--- a/recorder.h |+++ b/recorder.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1363 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recording.h b/recording.h |index 37979ec..52d57c8 100644 |--- a/recording.h |+++ b/recording.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1394 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.c b/timers.c |index 54ed1ba..c2298fa 100644 |--- a/timers.c |+++ b/timers.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1422 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.h b/timers.h |index 1d733ee..d35e042 100644 |--- a/timers.h |+++ b/timers.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1438 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/vdr.c b/vdr.c |index c32e45f..b9c4460 100644 |--- a/vdr.c |+++ b/vdr.c -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored can't find file to patch at input line 1542 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.c b/videodir.c |index 7331a85..14d4373 100644 |--- a/videodir.c |+++ b/videodir.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1589 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.h b/videodir.h |index 5e9aef5..57b8652 100644 |--- a/videodir.h |+++ b/videodir.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ========================================================================= PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < '/etc/portage/patches//media-video/vdr-1.7.21/0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch' ========================================================================= can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001 |From: Dominic Evans |Date: Fri, 23 Dec 2011 10:51:30 +0000 |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21 | |--- | Makefile | 5 + | config.c | 7 + | config.h | 4 + | device.c | 21 +++ | device.h | 4 + | dvbplayer.c | 51 ++++++++ | livebuffer.c | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | livebuffer.h | 47 +++++++ | menu.c | 248 +++++++++++++++++++++++++++++++++++- | menu.h | 22 +++ | osdbase.h | 3 + | player.c | 11 ++ | po/de_DE.po | 3 + | recorder.c | 10 ++ | recorder.h | 15 ++ | recording.h | 19 +++ | timers.c | 8 + | timers.h | 4 + | vdr.c | 52 ++++++++- | videodir.c | 18 +++ | videodir.h | 3 + | 21 files changed, 951 insertions(+), 7 deletions(-) | create mode 100644 livebuffer.c | create mode 100644 livebuffer.h | |diff --git a/Makefile b/Makefile |index 18d7eb9..bc49dac 100644 |--- a/Makefile |+++ b/Makefile -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 52 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.c b/config.c |index 73bb00d..14146a0 100644 |--- a/config.c |+++ b/config.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 88 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.h b/config.h |index c51e3df..1972195 100644 |--- a/config.h |+++ b/config.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 103 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.c b/device.c |index ba098d8..172f3b3 100644 |--- a/device.c |+++ b/device.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 151 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.h b/device.h |index fd587a8..2bebe89 100644 |--- a/device.h |+++ b/device.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 167 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dvbplayer.c b/dvbplayer.c |index 017df6d..800a31d 100644 |--- a/dvbplayer.c |+++ b/dvbplayer.c -------------------------- No file to patch. Skipping patch. 9 out of 9 hunks ignored can't find file to patch at input line 304 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.c b/livebuffer.c |new file mode 100644 |index 0000000..afc988d |--- /dev/null |+++ b/livebuffer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 713 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.h b/livebuffer.h |new file mode 100644 |index 0000000..8382d7d |--- /dev/null |+++ b/livebuffer.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 765 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.c b/menu.c |index ef2bb46..621d2ce 100644 |--- a/menu.c |+++ b/menu.c -------------------------- No file to patch. Skipping patch. 19 out of 19 hunks ignored can't find file to patch at input line 1181 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.h b/menu.h |index ec1c175..2d55470 100644 |--- a/menu.h |+++ b/menu.h -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1232 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/osdbase.h b/osdbase.h |index 91c5ff7..27c22b7 100644 |--- a/osdbase.h |+++ b/osdbase.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1246 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/player.c b/player.c |index 3490565..9aa2956 100644 |--- a/player.c |+++ b/player.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1275 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/po/de_DE.po b/po/de_DE.po |index 6d5b822..355348b 100644 |--- a/po/de_DE.po |+++ b/po/de_DE.po -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1289 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.c b/recorder.c |index a6cab47..70e4659 100644 |--- a/recorder.c |+++ b/recorder.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1325 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.h b/recorder.h |index 05cc42b..1d2aa04 100644 |--- a/recorder.h |+++ b/recorder.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1363 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recording.h b/recording.h |index 37979ec..52d57c8 100644 |--- a/recording.h |+++ b/recording.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1394 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.c b/timers.c |index 54ed1ba..c2298fa 100644 |--- a/timers.c |+++ b/timers.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1422 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.h b/timers.h |index 1d733ee..d35e042 100644 |--- a/timers.h |+++ b/timers.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1438 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/vdr.c b/vdr.c |index c32e45f..b9c4460 100644 |--- a/vdr.c |+++ b/vdr.c -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored can't find file to patch at input line 1542 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.c b/videodir.c |index 7331a85..14d4373 100644 |--- a/videodir.c |+++ b/videodir.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1589 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.h b/videodir.h |index 5e9aef5..57b8652 100644 |--- a/videodir.h |+++ b/videodir.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ========================================================================= PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < '/etc/portage/patches//media-video/vdr-1.7.21/0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch' ========================================================================= can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001 |From: Dominic Evans |Date: Fri, 23 Dec 2011 10:51:30 +0000 |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21 | |--- | Makefile | 5 + | config.c | 7 + | config.h | 4 + | device.c | 21 +++ | device.h | 4 + | dvbplayer.c | 51 ++++++++ | livebuffer.c | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | livebuffer.h | 47 +++++++ | menu.c | 248 +++++++++++++++++++++++++++++++++++- | menu.h | 22 +++ | osdbase.h | 3 + | player.c | 11 ++ | po/de_DE.po | 3 + | recorder.c | 10 ++ | recorder.h | 15 ++ | recording.h | 19 +++ | timers.c | 8 + | timers.h | 4 + | vdr.c | 52 ++++++++- | videodir.c | 18 +++ | videodir.h | 3 + | 21 files changed, 951 insertions(+), 7 deletions(-) | create mode 100644 livebuffer.c | create mode 100644 livebuffer.h | |diff --git a/Makefile b/Makefile |index 18d7eb9..bc49dac 100644 |--- a/Makefile |+++ b/Makefile -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 52 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.c b/config.c |index 73bb00d..14146a0 100644 |--- a/config.c |+++ b/config.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 88 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/config.h b/config.h |index c51e3df..1972195 100644 |--- a/config.h |+++ b/config.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 103 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.c b/device.c |index ba098d8..172f3b3 100644 |--- a/device.c |+++ b/device.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 151 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/device.h b/device.h |index fd587a8..2bebe89 100644 |--- a/device.h |+++ b/device.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 167 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dvbplayer.c b/dvbplayer.c |index 017df6d..800a31d 100644 |--- a/dvbplayer.c |+++ b/dvbplayer.c -------------------------- No file to patch. Skipping patch. 9 out of 9 hunks ignored can't find file to patch at input line 304 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.c b/livebuffer.c |new file mode 100644 |index 0000000..afc988d |--- /dev/null |+++ b/livebuffer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 713 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/livebuffer.h b/livebuffer.h |new file mode 100644 |index 0000000..8382d7d |--- /dev/null |+++ b/livebuffer.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 765 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.c b/menu.c |index ef2bb46..621d2ce 100644 |--- a/menu.c |+++ b/menu.c -------------------------- No file to patch. Skipping patch. 19 out of 19 hunks ignored can't find file to patch at input line 1181 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/menu.h b/menu.h |index ec1c175..2d55470 100644 |--- a/menu.h |+++ b/menu.h -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1232 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/osdbase.h b/osdbase.h |index 91c5ff7..27c22b7 100644 |--- a/osdbase.h |+++ b/osdbase.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1246 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/player.c b/player.c |index 3490565..9aa2956 100644 |--- a/player.c |+++ b/player.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1275 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/po/de_DE.po b/po/de_DE.po |index 6d5b822..355348b 100644 |--- a/po/de_DE.po |+++ b/po/de_DE.po -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1289 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.c b/recorder.c |index a6cab47..70e4659 100644 |--- a/recorder.c |+++ b/recorder.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 1325 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recorder.h b/recorder.h |index 05cc42b..1d2aa04 100644 |--- a/recorder.h |+++ b/recorder.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1363 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/recording.h b/recording.h |index 37979ec..52d57c8 100644 |--- a/recording.h |+++ b/recording.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1394 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.c b/timers.c |index 54ed1ba..c2298fa 100644 |--- a/timers.c |+++ b/timers.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1422 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/timers.h b/timers.h |index 1d733ee..d35e042 100644 |--- a/timers.h |+++ b/timers.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1438 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/vdr.c b/vdr.c |index c32e45f..b9c4460 100644 |--- a/vdr.c |+++ b/vdr.c -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored can't find file to patch at input line 1542 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.c b/videodir.c |index 7331a85..14d4373 100644 |--- a/videodir.c |+++ b/videodir.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 1589 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/videodir.h b/videodir.h |index 5e9aef5..57b8652 100644 |--- a/videodir.h |+++ b/videodir.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1