Pastebin launched a little side project called HostCabi.net, check it out ;-)Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on Jan 1st, 2012  |  syntax: Diff  |  size: 36.66 KB  |  hits: 45  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. ***** 0001-opt-96-livebuffer12-rmm.dpatch-rebased-onto-1.7.21.patch *****
  2. PWD: /var/tmp/portage/media-video/vdr-1.7.21-r2/work/vdr-1.7.21
  3.  
  4. =========================================================================
  5.  
  6. 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'
  7.  
  8. =========================================================================
  9. can't find file to patch at input line 36
  10. Perhaps you used the wrong -p or --strip option?
  11. The text leading up to this was:
  12. --------------------------
  13. |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001
  14. |From: Dominic Evans <oldmanuk@gmail.com>
  15. |Date: Fri, 23 Dec 2011 10:51:30 +0000
  16. |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21
  17. |
  18. |---
  19. | Makefile     |    5 +
  20. | config.c     |    7 +
  21. | config.h     |    4 +
  22. | device.c     |   21 +++
  23. | device.h     |    4 +
  24. | dvbplayer.c  |   51 ++++++++
  25. | livebuffer.c |  403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  26. | livebuffer.h |   47 +++++++
  27. | menu.c       |  248 +++++++++++++++++++++++++++++++++++-
  28. | menu.h       |   22 +++
  29. | osdbase.h    |    3 +
  30. | player.c     |   11 ++
  31. | po/de_DE.po  |    3 +
  32. | recorder.c   |   10 ++
  33. | recorder.h   |   15 ++
  34. | recording.h  |   19 +++
  35. | timers.c     |    8 +
  36. | timers.h     |    4 +
  37. | vdr.c        |   52 ++++++++-
  38. | videodir.c   |   18 +++
  39. | videodir.h   |    3 +
  40. | 21 files changed, 951 insertions(+), 7 deletions(-)
  41. | create mode 100644 livebuffer.c
  42. | create mode 100644 livebuffer.h
  43. |
  44. |diff --git a/Makefile b/Makefile
  45. |index 18d7eb9..bc49dac 100644
  46. |--- a/Makefile
  47. |+++ b/Makefile
  48. --------------------------
  49. No file to patch.  Skipping patch.
  50. 1 out of 1 hunk ignored
  51. can't find file to patch at input line 52
  52. Perhaps you used the wrong -p or --strip option?
  53. The text leading up to this was:
  54. --------------------------
  55. |diff --git a/config.c b/config.c
  56. |index 73bb00d..14146a0 100644
  57. |--- a/config.c
  58. |+++ b/config.c
  59. --------------------------
  60. No file to patch.  Skipping patch.
  61. 3 out of 3 hunks ignored
  62. can't find file to patch at input line 88
  63. Perhaps you used the wrong -p or --strip option?
  64. The text leading up to this was:
  65. --------------------------
  66. |diff --git a/config.h b/config.h
  67. |index c51e3df..1972195 100644
  68. |--- a/config.h
  69. |+++ b/config.h
  70. --------------------------
  71. No file to patch.  Skipping patch.
  72. 1 out of 1 hunk ignored
  73. can't find file to patch at input line 103
  74. Perhaps you used the wrong -p or --strip option?
  75. The text leading up to this was:
  76. --------------------------
  77. |diff --git a/device.c b/device.c
  78. |index ba098d8..172f3b3 100644
  79. |--- a/device.c
  80. |+++ b/device.c
  81. --------------------------
  82. No file to patch.  Skipping patch.
  83. 3 out of 3 hunks ignored
  84. can't find file to patch at input line 151
  85. Perhaps you used the wrong -p or --strip option?
  86. The text leading up to this was:
  87. --------------------------
  88. |diff --git a/device.h b/device.h
  89. |index fd587a8..2bebe89 100644
  90. |--- a/device.h
  91. |+++ b/device.h
  92. --------------------------
  93. No file to patch.  Skipping patch.
  94. 1 out of 1 hunk ignored
  95. can't find file to patch at input line 167
  96. Perhaps you used the wrong -p or --strip option?
  97. The text leading up to this was:
  98. --------------------------
  99. |diff --git a/dvbplayer.c b/dvbplayer.c
  100. |index 017df6d..800a31d 100644
  101. |--- a/dvbplayer.c
  102. |+++ b/dvbplayer.c
  103. --------------------------
  104. No file to patch.  Skipping patch.
  105. 9 out of 9 hunks ignored
  106. patching file b/livebuffer.c
  107. patching file b/livebuffer.h
  108. can't find file to patch at input line 765
  109. Perhaps you used the wrong -p or --strip option?
  110. The text leading up to this was:
  111. --------------------------
  112. |diff --git a/menu.c b/menu.c
  113. |index ef2bb46..621d2ce 100644
  114. |--- a/menu.c
  115. |+++ b/menu.c
  116. --------------------------
  117. No file to patch.  Skipping patch.
  118. 19 out of 19 hunks ignored
  119. can't find file to patch at input line 1181
  120. Perhaps you used the wrong -p or --strip option?
  121. The text leading up to this was:
  122. --------------------------
  123. |diff --git a/menu.h b/menu.h
  124. |index ec1c175..2d55470 100644
  125. |--- a/menu.h
  126. |+++ b/menu.h
  127. --------------------------
  128. No file to patch.  Skipping patch.
  129. 3 out of 3 hunks ignored
  130. can't find file to patch at input line 1232
  131. Perhaps you used the wrong -p or --strip option?
  132. The text leading up to this was:
  133. --------------------------
  134. |diff --git a/osdbase.h b/osdbase.h
  135. |index 91c5ff7..27c22b7 100644
  136. |--- a/osdbase.h
  137. |+++ b/osdbase.h
  138. --------------------------
  139. No file to patch.  Skipping patch.
  140. 1 out of 1 hunk ignored
  141. can't find file to patch at input line 1246
  142. Perhaps you used the wrong -p or --strip option?
  143. The text leading up to this was:
  144. --------------------------
  145. |diff --git a/player.c b/player.c
  146. |index 3490565..9aa2956 100644
  147. |--- a/player.c
  148. |+++ b/player.c
  149. --------------------------
  150. No file to patch.  Skipping patch.
  151. 2 out of 2 hunks ignored
  152. can't find file to patch at input line 1275
  153. Perhaps you used the wrong -p or --strip option?
  154. The text leading up to this was:
  155. --------------------------
  156. |diff --git a/po/de_DE.po b/po/de_DE.po
  157. |index 6d5b822..355348b 100644
  158. |--- a/po/de_DE.po
  159. |+++ b/po/de_DE.po
  160. --------------------------
  161. No file to patch.  Skipping patch.
  162. 1 out of 1 hunk ignored
  163. can't find file to patch at input line 1289
  164. Perhaps you used the wrong -p or --strip option?
  165. The text leading up to this was:
  166. --------------------------
  167. |diff --git a/recorder.c b/recorder.c
  168. |index a6cab47..70e4659 100644
  169. |--- a/recorder.c
  170. |+++ b/recorder.c
  171. --------------------------
  172. No file to patch.  Skipping patch.
  173. 3 out of 3 hunks ignored
  174. can't find file to patch at input line 1325
  175. Perhaps you used the wrong -p or --strip option?
  176. The text leading up to this was:
  177. --------------------------
  178. |diff --git a/recorder.h b/recorder.h
  179. |index 05cc42b..1d2aa04 100644
  180. |--- a/recorder.h
  181. |+++ b/recorder.h
  182. --------------------------
  183. No file to patch.  Skipping patch.
  184. 1 out of 1 hunk ignored
  185. can't find file to patch at input line 1363
  186. Perhaps you used the wrong -p or --strip option?
  187. The text leading up to this was:
  188. --------------------------
  189. |diff --git a/recording.h b/recording.h
  190. |index 37979ec..52d57c8 100644
  191. |--- a/recording.h
  192. |+++ b/recording.h
  193. --------------------------
  194. No file to patch.  Skipping patch.
  195. 1 out of 1 hunk ignored
  196. can't find file to patch at input line 1394
  197. Perhaps you used the wrong -p or --strip option?
  198. The text leading up to this was:
  199. --------------------------
  200. |diff --git a/timers.c b/timers.c
  201. |index 54ed1ba..c2298fa 100644
  202. |--- a/timers.c
  203. |+++ b/timers.c
  204. --------------------------
  205. No file to patch.  Skipping patch.
  206. 2 out of 2 hunks ignored
  207. can't find file to patch at input line 1422
  208. Perhaps you used the wrong -p or --strip option?
  209. The text leading up to this was:
  210. --------------------------
  211. |diff --git a/timers.h b/timers.h
  212. |index 1d733ee..d35e042 100644
  213. |--- a/timers.h
  214. |+++ b/timers.h
  215. --------------------------
  216. No file to patch.  Skipping patch.
  217. 1 out of 1 hunk ignored
  218. can't find file to patch at input line 1438
  219. Perhaps you used the wrong -p or --strip option?
  220. The text leading up to this was:
  221. --------------------------
  222. |diff --git a/vdr.c b/vdr.c
  223. |index c32e45f..b9c4460 100644
  224. |--- a/vdr.c
  225. |+++ b/vdr.c
  226. --------------------------
  227. No file to patch.  Skipping patch.
  228. 6 out of 6 hunks ignored
  229. can't find file to patch at input line 1542
  230. Perhaps you used the wrong -p or --strip option?
  231. The text leading up to this was:
  232. --------------------------
  233. |diff --git a/videodir.c b/videodir.c
  234. |index 7331a85..14d4373 100644
  235. |--- a/videodir.c
  236. |+++ b/videodir.c
  237. --------------------------
  238. No file to patch.  Skipping patch.
  239. 2 out of 2 hunks ignored
  240. can't find file to patch at input line 1589
  241. Perhaps you used the wrong -p or --strip option?
  242. The text leading up to this was:
  243. --------------------------
  244. |diff --git a/videodir.h b/videodir.h
  245. |index 5e9aef5..57b8652 100644
  246. |--- a/videodir.h
  247. |+++ b/videodir.h
  248. --------------------------
  249. No file to patch.  Skipping patch.
  250. 1 out of 1 hunk ignored
  251.  
  252. patch program exited with status 1
  253. =========================================================================
  254.  
  255. 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'
  256.  
  257. =========================================================================
  258. patching file Makefile
  259. Hunk #1 succeeded at 65 (offset 5 lines).
  260. patching file config.c
  261. Hunk #1 succeeded at 407 with fuzz 1 (offset 10 lines).
  262. Hunk #2 succeeded at 627 with fuzz 1 (offset 34 lines).
  263. Hunk #3 succeeded at 778 with fuzz 1 (offset 85 lines).
  264. patching file config.h
  265. Hunk #1 succeeded at 315 with fuzz 2 (offset 27 lines).
  266. patching file device.c
  267. Hunk #2 succeeded at 701 (offset 36 lines).
  268. Hunk #3 succeeded at 830 (offset 100 lines).
  269. patching file device.h
  270. patching file dvbplayer.c
  271. Hunk #3 succeeded at 212 with fuzz 2 (offset 1 line).
  272. Hunk #4 FAILED at 281.
  273. Hunk #5 succeeded at 302 (offset 2 lines).
  274. Hunk #6 succeeded at 410 with fuzz 2 (offset 8 lines).
  275. Hunk #7 succeeded at 474 (offset 21 lines).
  276. Hunk #8 succeeded at 534 with fuzz 1 (offset 59 lines).
  277. Hunk #9 succeeded at 688 (offset 71 lines).
  278. 1 out of 9 hunks FAILED -- saving rejects to file dvbplayer.c.rej
  279. patching file livebuffer.c
  280. patching file livebuffer.h
  281. patching file menu.c
  282. Hunk #1 succeeded at 3366 with fuzz 2 (offset 323 lines).
  283. Hunk #2 succeeded at 3412 (offset 354 lines).
  284. Hunk #3 succeeded at 3424 with fuzz 1 (offset 354 lines).
  285. Hunk #4 FAILED at 4146.
  286. Hunk #5 succeeded at 4764 (offset 533 lines).
  287. Hunk #6 succeeded at 4849 (offset 543 lines).
  288. Hunk #7 succeeded at 4890 (offset 543 lines).
  289. Hunk #8 succeeded at 5143 (offset 550 lines).
  290. Hunk #9 succeeded at 5180 (offset 550 lines).
  291. Hunk #10 succeeded at 5320 (offset 550 lines).
  292. Hunk #11 succeeded at 5341 (offset 550 lines).
  293. Hunk #12 succeeded at 5366 (offset 552 lines).
  294. Hunk #13 succeeded at 5392 (offset 561 lines).
  295. Hunk #14 succeeded at 5419 (offset 561 lines).
  296. Hunk #15 succeeded at 5440 (offset 561 lines).
  297. Hunk #16 succeeded at 5474 (offset 561 lines).
  298. Hunk #17 succeeded at 5498 (offset 561 lines).
  299. Hunk #18 FAILED at 4975.
  300. Hunk #19 FAILED at 5014.
  301. 3 out of 19 hunks FAILED -- saving rejects to file menu.c.rej
  302. patching file menu.h
  303. Hunk #1 FAILED at 18.
  304. Hunk #2 succeeded at 240 (offset 4 lines).
  305. Hunk #3 succeeded at 260 (offset 4 lines).
  306. 1 out of 3 hunks FAILED -- saving rejects to file menu.h.rej
  307. patching file osdbase.h
  308. Hunk #1 succeeded at 35 (offset 2 lines).
  309. patching file player.c
  310. patching file po/de_DE.po
  311. patching file recorder.c
  312. patching file recorder.h
  313. patching file recording.h
  314. Hunk #1 succeeded at 275 (offset 11 lines).
  315. patching file timers.c
  316. patching file timers.h
  317. Hunk #1 succeeded at 44 (offset 1 line).
  318. patching file vdr.c
  319. Hunk #5 succeeded at 1128 (offset 17 lines).
  320. Hunk #6 succeeded at 1244 (offset 17 lines).
  321. patching file videodir.c
  322. Hunk #2 FAILED at 109.
  323. 1 out of 2 hunks FAILED -- saving rejects to file videodir.c.rej
  324. patching file videodir.h
  325.  
  326. patch program exited with status 1
  327. =========================================================================
  328.  
  329. 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'
  330.  
  331. =========================================================================
  332. can't find file to patch at input line 36
  333. Perhaps you used the wrong -p or --strip option?
  334. The text leading up to this was:
  335. --------------------------
  336. |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001
  337. |From: Dominic Evans <oldmanuk@gmail.com>
  338. |Date: Fri, 23 Dec 2011 10:51:30 +0000
  339. |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21
  340. |
  341. |---
  342. | Makefile     |    5 +
  343. | config.c     |    7 +
  344. | config.h     |    4 +
  345. | device.c     |   21 +++
  346. | device.h     |    4 +
  347. | dvbplayer.c  |   51 ++++++++
  348. | livebuffer.c |  403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  349. | livebuffer.h |   47 +++++++
  350. | menu.c       |  248 +++++++++++++++++++++++++++++++++++-
  351. | menu.h       |   22 +++
  352. | osdbase.h    |    3 +
  353. | player.c     |   11 ++
  354. | po/de_DE.po  |    3 +
  355. | recorder.c   |   10 ++
  356. | recorder.h   |   15 ++
  357. | recording.h  |   19 +++
  358. | timers.c     |    8 +
  359. | timers.h     |    4 +
  360. | vdr.c        |   52 ++++++++-
  361. | videodir.c   |   18 +++
  362. | videodir.h   |    3 +
  363. | 21 files changed, 951 insertions(+), 7 deletions(-)
  364. | create mode 100644 livebuffer.c
  365. | create mode 100644 livebuffer.h
  366. |
  367. |diff --git a/Makefile b/Makefile
  368. |index 18d7eb9..bc49dac 100644
  369. |--- a/Makefile
  370. |+++ b/Makefile
  371. --------------------------
  372. No file to patch.  Skipping patch.
  373. 1 out of 1 hunk ignored
  374. can't find file to patch at input line 52
  375. Perhaps you used the wrong -p or --strip option?
  376. The text leading up to this was:
  377. --------------------------
  378. |diff --git a/config.c b/config.c
  379. |index 73bb00d..14146a0 100644
  380. |--- a/config.c
  381. |+++ b/config.c
  382. --------------------------
  383. No file to patch.  Skipping patch.
  384. 3 out of 3 hunks ignored
  385. can't find file to patch at input line 88
  386. Perhaps you used the wrong -p or --strip option?
  387. The text leading up to this was:
  388. --------------------------
  389. |diff --git a/config.h b/config.h
  390. |index c51e3df..1972195 100644
  391. |--- a/config.h
  392. |+++ b/config.h
  393. --------------------------
  394. No file to patch.  Skipping patch.
  395. 1 out of 1 hunk ignored
  396. can't find file to patch at input line 103
  397. Perhaps you used the wrong -p or --strip option?
  398. The text leading up to this was:
  399. --------------------------
  400. |diff --git a/device.c b/device.c
  401. |index ba098d8..172f3b3 100644
  402. |--- a/device.c
  403. |+++ b/device.c
  404. --------------------------
  405. No file to patch.  Skipping patch.
  406. 3 out of 3 hunks ignored
  407. can't find file to patch at input line 151
  408. Perhaps you used the wrong -p or --strip option?
  409. The text leading up to this was:
  410. --------------------------
  411. |diff --git a/device.h b/device.h
  412. |index fd587a8..2bebe89 100644
  413. |--- a/device.h
  414. |+++ b/device.h
  415. --------------------------
  416. No file to patch.  Skipping patch.
  417. 1 out of 1 hunk ignored
  418. can't find file to patch at input line 167
  419. Perhaps you used the wrong -p or --strip option?
  420. The text leading up to this was:
  421. --------------------------
  422. |diff --git a/dvbplayer.c b/dvbplayer.c
  423. |index 017df6d..800a31d 100644
  424. |--- a/dvbplayer.c
  425. |+++ b/dvbplayer.c
  426. --------------------------
  427. No file to patch.  Skipping patch.
  428. 9 out of 9 hunks ignored
  429. can't find file to patch at input line 304
  430. Perhaps you used the wrong -p or --strip option?
  431. The text leading up to this was:
  432. --------------------------
  433. |diff --git a/livebuffer.c b/livebuffer.c
  434. |new file mode 100644
  435. |index 0000000..afc988d
  436. |--- /dev/null
  437. |+++ b/livebuffer.c
  438. --------------------------
  439. No file to patch.  Skipping patch.
  440. 1 out of 1 hunk ignored
  441. can't find file to patch at input line 713
  442. Perhaps you used the wrong -p or --strip option?
  443. The text leading up to this was:
  444. --------------------------
  445. |diff --git a/livebuffer.h b/livebuffer.h
  446. |new file mode 100644
  447. |index 0000000..8382d7d
  448. |--- /dev/null
  449. |+++ b/livebuffer.h
  450. --------------------------
  451. No file to patch.  Skipping patch.
  452. 1 out of 1 hunk ignored
  453. can't find file to patch at input line 765
  454. Perhaps you used the wrong -p or --strip option?
  455. The text leading up to this was:
  456. --------------------------
  457. |diff --git a/menu.c b/menu.c
  458. |index ef2bb46..621d2ce 100644
  459. |--- a/menu.c
  460. |+++ b/menu.c
  461. --------------------------
  462. No file to patch.  Skipping patch.
  463. 19 out of 19 hunks ignored
  464. can't find file to patch at input line 1181
  465. Perhaps you used the wrong -p or --strip option?
  466. The text leading up to this was:
  467. --------------------------
  468. |diff --git a/menu.h b/menu.h
  469. |index ec1c175..2d55470 100644
  470. |--- a/menu.h
  471. |+++ b/menu.h
  472. --------------------------
  473. No file to patch.  Skipping patch.
  474. 3 out of 3 hunks ignored
  475. can't find file to patch at input line 1232
  476. Perhaps you used the wrong -p or --strip option?
  477. The text leading up to this was:
  478. --------------------------
  479. |diff --git a/osdbase.h b/osdbase.h
  480. |index 91c5ff7..27c22b7 100644
  481. |--- a/osdbase.h
  482. |+++ b/osdbase.h
  483. --------------------------
  484. No file to patch.  Skipping patch.
  485. 1 out of 1 hunk ignored
  486. can't find file to patch at input line 1246
  487. Perhaps you used the wrong -p or --strip option?
  488. The text leading up to this was:
  489. --------------------------
  490. |diff --git a/player.c b/player.c
  491. |index 3490565..9aa2956 100644
  492. |--- a/player.c
  493. |+++ b/player.c
  494. --------------------------
  495. No file to patch.  Skipping patch.
  496. 2 out of 2 hunks ignored
  497. can't find file to patch at input line 1275
  498. Perhaps you used the wrong -p or --strip option?
  499. The text leading up to this was:
  500. --------------------------
  501. |diff --git a/po/de_DE.po b/po/de_DE.po
  502. |index 6d5b822..355348b 100644
  503. |--- a/po/de_DE.po
  504. |+++ b/po/de_DE.po
  505. --------------------------
  506. No file to patch.  Skipping patch.
  507. 1 out of 1 hunk ignored
  508. can't find file to patch at input line 1289
  509. Perhaps you used the wrong -p or --strip option?
  510. The text leading up to this was:
  511. --------------------------
  512. |diff --git a/recorder.c b/recorder.c
  513. |index a6cab47..70e4659 100644
  514. |--- a/recorder.c
  515. |+++ b/recorder.c
  516. --------------------------
  517. No file to patch.  Skipping patch.
  518. 3 out of 3 hunks ignored
  519. can't find file to patch at input line 1325
  520. Perhaps you used the wrong -p or --strip option?
  521. The text leading up to this was:
  522. --------------------------
  523. |diff --git a/recorder.h b/recorder.h
  524. |index 05cc42b..1d2aa04 100644
  525. |--- a/recorder.h
  526. |+++ b/recorder.h
  527. --------------------------
  528. No file to patch.  Skipping patch.
  529. 1 out of 1 hunk ignored
  530. can't find file to patch at input line 1363
  531. Perhaps you used the wrong -p or --strip option?
  532. The text leading up to this was:
  533. --------------------------
  534. |diff --git a/recording.h b/recording.h
  535. |index 37979ec..52d57c8 100644
  536. |--- a/recording.h
  537. |+++ b/recording.h
  538. --------------------------
  539. No file to patch.  Skipping patch.
  540. 1 out of 1 hunk ignored
  541. can't find file to patch at input line 1394
  542. Perhaps you used the wrong -p or --strip option?
  543. The text leading up to this was:
  544. --------------------------
  545. |diff --git a/timers.c b/timers.c
  546. |index 54ed1ba..c2298fa 100644
  547. |--- a/timers.c
  548. |+++ b/timers.c
  549. --------------------------
  550. No file to patch.  Skipping patch.
  551. 2 out of 2 hunks ignored
  552. can't find file to patch at input line 1422
  553. Perhaps you used the wrong -p or --strip option?
  554. The text leading up to this was:
  555. --------------------------
  556. |diff --git a/timers.h b/timers.h
  557. |index 1d733ee..d35e042 100644
  558. |--- a/timers.h
  559. |+++ b/timers.h
  560. --------------------------
  561. No file to patch.  Skipping patch.
  562. 1 out of 1 hunk ignored
  563. can't find file to patch at input line 1438
  564. Perhaps you used the wrong -p or --strip option?
  565. The text leading up to this was:
  566. --------------------------
  567. |diff --git a/vdr.c b/vdr.c
  568. |index c32e45f..b9c4460 100644
  569. |--- a/vdr.c
  570. |+++ b/vdr.c
  571. --------------------------
  572. No file to patch.  Skipping patch.
  573. 6 out of 6 hunks ignored
  574. can't find file to patch at input line 1542
  575. Perhaps you used the wrong -p or --strip option?
  576. The text leading up to this was:
  577. --------------------------
  578. |diff --git a/videodir.c b/videodir.c
  579. |index 7331a85..14d4373 100644
  580. |--- a/videodir.c
  581. |+++ b/videodir.c
  582. --------------------------
  583. No file to patch.  Skipping patch.
  584. 2 out of 2 hunks ignored
  585. can't find file to patch at input line 1589
  586. Perhaps you used the wrong -p or --strip option?
  587. The text leading up to this was:
  588. --------------------------
  589. |diff --git a/videodir.h b/videodir.h
  590. |index 5e9aef5..57b8652 100644
  591. |--- a/videodir.h
  592. |+++ b/videodir.h
  593. --------------------------
  594. No file to patch.  Skipping patch.
  595. 1 out of 1 hunk ignored
  596.  
  597. patch program exited with status 1
  598. =========================================================================
  599.  
  600. 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'
  601.  
  602. =========================================================================
  603. can't find file to patch at input line 36
  604. Perhaps you used the wrong -p or --strip option?
  605. The text leading up to this was:
  606. --------------------------
  607. |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001
  608. |From: Dominic Evans <oldmanuk@gmail.com>
  609. |Date: Fri, 23 Dec 2011 10:51:30 +0000
  610. |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21
  611. |
  612. |---
  613. | Makefile     |    5 +
  614. | config.c     |    7 +
  615. | config.h     |    4 +
  616. | device.c     |   21 +++
  617. | device.h     |    4 +
  618. | dvbplayer.c  |   51 ++++++++
  619. | livebuffer.c |  403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  620. | livebuffer.h |   47 +++++++
  621. | menu.c       |  248 +++++++++++++++++++++++++++++++++++-
  622. | menu.h       |   22 +++
  623. | osdbase.h    |    3 +
  624. | player.c     |   11 ++
  625. | po/de_DE.po  |    3 +
  626. | recorder.c   |   10 ++
  627. | recorder.h   |   15 ++
  628. | recording.h  |   19 +++
  629. | timers.c     |    8 +
  630. | timers.h     |    4 +
  631. | vdr.c        |   52 ++++++++-
  632. | videodir.c   |   18 +++
  633. | videodir.h   |    3 +
  634. | 21 files changed, 951 insertions(+), 7 deletions(-)
  635. | create mode 100644 livebuffer.c
  636. | create mode 100644 livebuffer.h
  637. |
  638. |diff --git a/Makefile b/Makefile
  639. |index 18d7eb9..bc49dac 100644
  640. |--- a/Makefile
  641. |+++ b/Makefile
  642. --------------------------
  643. No file to patch.  Skipping patch.
  644. 1 out of 1 hunk ignored
  645. can't find file to patch at input line 52
  646. Perhaps you used the wrong -p or --strip option?
  647. The text leading up to this was:
  648. --------------------------
  649. |diff --git a/config.c b/config.c
  650. |index 73bb00d..14146a0 100644
  651. |--- a/config.c
  652. |+++ b/config.c
  653. --------------------------
  654. No file to patch.  Skipping patch.
  655. 3 out of 3 hunks ignored
  656. can't find file to patch at input line 88
  657. Perhaps you used the wrong -p or --strip option?
  658. The text leading up to this was:
  659. --------------------------
  660. |diff --git a/config.h b/config.h
  661. |index c51e3df..1972195 100644
  662. |--- a/config.h
  663. |+++ b/config.h
  664. --------------------------
  665. No file to patch.  Skipping patch.
  666. 1 out of 1 hunk ignored
  667. can't find file to patch at input line 103
  668. Perhaps you used the wrong -p or --strip option?
  669. The text leading up to this was:
  670. --------------------------
  671. |diff --git a/device.c b/device.c
  672. |index ba098d8..172f3b3 100644
  673. |--- a/device.c
  674. |+++ b/device.c
  675. --------------------------
  676. No file to patch.  Skipping patch.
  677. 3 out of 3 hunks ignored
  678. can't find file to patch at input line 151
  679. Perhaps you used the wrong -p or --strip option?
  680. The text leading up to this was:
  681. --------------------------
  682. |diff --git a/device.h b/device.h
  683. |index fd587a8..2bebe89 100644
  684. |--- a/device.h
  685. |+++ b/device.h
  686. --------------------------
  687. No file to patch.  Skipping patch.
  688. 1 out of 1 hunk ignored
  689. can't find file to patch at input line 167
  690. Perhaps you used the wrong -p or --strip option?
  691. The text leading up to this was:
  692. --------------------------
  693. |diff --git a/dvbplayer.c b/dvbplayer.c
  694. |index 017df6d..800a31d 100644
  695. |--- a/dvbplayer.c
  696. |+++ b/dvbplayer.c
  697. --------------------------
  698. No file to patch.  Skipping patch.
  699. 9 out of 9 hunks ignored
  700. can't find file to patch at input line 304
  701. Perhaps you used the wrong -p or --strip option?
  702. The text leading up to this was:
  703. --------------------------
  704. |diff --git a/livebuffer.c b/livebuffer.c
  705. |new file mode 100644
  706. |index 0000000..afc988d
  707. |--- /dev/null
  708. |+++ b/livebuffer.c
  709. --------------------------
  710. No file to patch.  Skipping patch.
  711. 1 out of 1 hunk ignored
  712. can't find file to patch at input line 713
  713. Perhaps you used the wrong -p or --strip option?
  714. The text leading up to this was:
  715. --------------------------
  716. |diff --git a/livebuffer.h b/livebuffer.h
  717. |new file mode 100644
  718. |index 0000000..8382d7d
  719. |--- /dev/null
  720. |+++ b/livebuffer.h
  721. --------------------------
  722. No file to patch.  Skipping patch.
  723. 1 out of 1 hunk ignored
  724. can't find file to patch at input line 765
  725. Perhaps you used the wrong -p or --strip option?
  726. The text leading up to this was:
  727. --------------------------
  728. |diff --git a/menu.c b/menu.c
  729. |index ef2bb46..621d2ce 100644
  730. |--- a/menu.c
  731. |+++ b/menu.c
  732. --------------------------
  733. No file to patch.  Skipping patch.
  734. 19 out of 19 hunks ignored
  735. can't find file to patch at input line 1181
  736. Perhaps you used the wrong -p or --strip option?
  737. The text leading up to this was:
  738. --------------------------
  739. |diff --git a/menu.h b/menu.h
  740. |index ec1c175..2d55470 100644
  741. |--- a/menu.h
  742. |+++ b/menu.h
  743. --------------------------
  744. No file to patch.  Skipping patch.
  745. 3 out of 3 hunks ignored
  746. can't find file to patch at input line 1232
  747. Perhaps you used the wrong -p or --strip option?
  748. The text leading up to this was:
  749. --------------------------
  750. |diff --git a/osdbase.h b/osdbase.h
  751. |index 91c5ff7..27c22b7 100644
  752. |--- a/osdbase.h
  753. |+++ b/osdbase.h
  754. --------------------------
  755. No file to patch.  Skipping patch.
  756. 1 out of 1 hunk ignored
  757. can't find file to patch at input line 1246
  758. Perhaps you used the wrong -p or --strip option?
  759. The text leading up to this was:
  760. --------------------------
  761. |diff --git a/player.c b/player.c
  762. |index 3490565..9aa2956 100644
  763. |--- a/player.c
  764. |+++ b/player.c
  765. --------------------------
  766. No file to patch.  Skipping patch.
  767. 2 out of 2 hunks ignored
  768. can't find file to patch at input line 1275
  769. Perhaps you used the wrong -p or --strip option?
  770. The text leading up to this was:
  771. --------------------------
  772. |diff --git a/po/de_DE.po b/po/de_DE.po
  773. |index 6d5b822..355348b 100644
  774. |--- a/po/de_DE.po
  775. |+++ b/po/de_DE.po
  776. --------------------------
  777. No file to patch.  Skipping patch.
  778. 1 out of 1 hunk ignored
  779. can't find file to patch at input line 1289
  780. Perhaps you used the wrong -p or --strip option?
  781. The text leading up to this was:
  782. --------------------------
  783. |diff --git a/recorder.c b/recorder.c
  784. |index a6cab47..70e4659 100644
  785. |--- a/recorder.c
  786. |+++ b/recorder.c
  787. --------------------------
  788. No file to patch.  Skipping patch.
  789. 3 out of 3 hunks ignored
  790. can't find file to patch at input line 1325
  791. Perhaps you used the wrong -p or --strip option?
  792. The text leading up to this was:
  793. --------------------------
  794. |diff --git a/recorder.h b/recorder.h
  795. |index 05cc42b..1d2aa04 100644
  796. |--- a/recorder.h
  797. |+++ b/recorder.h
  798. --------------------------
  799. No file to patch.  Skipping patch.
  800. 1 out of 1 hunk ignored
  801. can't find file to patch at input line 1363
  802. Perhaps you used the wrong -p or --strip option?
  803. The text leading up to this was:
  804. --------------------------
  805. |diff --git a/recording.h b/recording.h
  806. |index 37979ec..52d57c8 100644
  807. |--- a/recording.h
  808. |+++ b/recording.h
  809. --------------------------
  810. No file to patch.  Skipping patch.
  811. 1 out of 1 hunk ignored
  812. can't find file to patch at input line 1394
  813. Perhaps you used the wrong -p or --strip option?
  814. The text leading up to this was:
  815. --------------------------
  816. |diff --git a/timers.c b/timers.c
  817. |index 54ed1ba..c2298fa 100644
  818. |--- a/timers.c
  819. |+++ b/timers.c
  820. --------------------------
  821. No file to patch.  Skipping patch.
  822. 2 out of 2 hunks ignored
  823. can't find file to patch at input line 1422
  824. Perhaps you used the wrong -p or --strip option?
  825. The text leading up to this was:
  826. --------------------------
  827. |diff --git a/timers.h b/timers.h
  828. |index 1d733ee..d35e042 100644
  829. |--- a/timers.h
  830. |+++ b/timers.h
  831. --------------------------
  832. No file to patch.  Skipping patch.
  833. 1 out of 1 hunk ignored
  834. can't find file to patch at input line 1438
  835. Perhaps you used the wrong -p or --strip option?
  836. The text leading up to this was:
  837. --------------------------
  838. |diff --git a/vdr.c b/vdr.c
  839. |index c32e45f..b9c4460 100644
  840. |--- a/vdr.c
  841. |+++ b/vdr.c
  842. --------------------------
  843. No file to patch.  Skipping patch.
  844. 6 out of 6 hunks ignored
  845. can't find file to patch at input line 1542
  846. Perhaps you used the wrong -p or --strip option?
  847. The text leading up to this was:
  848. --------------------------
  849. |diff --git a/videodir.c b/videodir.c
  850. |index 7331a85..14d4373 100644
  851. |--- a/videodir.c
  852. |+++ b/videodir.c
  853. --------------------------
  854. No file to patch.  Skipping patch.
  855. 2 out of 2 hunks ignored
  856. can't find file to patch at input line 1589
  857. Perhaps you used the wrong -p or --strip option?
  858. The text leading up to this was:
  859. --------------------------
  860. |diff --git a/videodir.h b/videodir.h
  861. |index 5e9aef5..57b8652 100644
  862. |--- a/videodir.h
  863. |+++ b/videodir.h
  864. --------------------------
  865. No file to patch.  Skipping patch.
  866. 1 out of 1 hunk ignored
  867.  
  868. patch program exited with status 1
  869. =========================================================================
  870.  
  871. 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'
  872.  
  873. =========================================================================
  874. can't find file to patch at input line 36
  875. Perhaps you used the wrong -p or --strip option?
  876. The text leading up to this was:
  877. --------------------------
  878. |From d99a28abfd108690028d7847b8736e542b089fd0 Mon Sep 17 00:00:00 2001
  879. |From: Dominic Evans <oldmanuk@gmail.com>
  880. |Date: Fri, 23 Dec 2011 10:51:30 +0000
  881. |Subject: [PATCH] opt-96-livebuffer12-rmm.dpatch rebased onto 1.7.21
  882. |
  883. |---
  884. | Makefile     |    5 +
  885. | config.c     |    7 +
  886. | config.h     |    4 +
  887. | device.c     |   21 +++
  888. | device.h     |    4 +
  889. | dvbplayer.c  |   51 ++++++++
  890. | livebuffer.c |  403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  891. | livebuffer.h |   47 +++++++
  892. | menu.c       |  248 +++++++++++++++++++++++++++++++++++-
  893. | menu.h       |   22 +++
  894. | osdbase.h    |    3 +
  895. | player.c     |   11 ++
  896. | po/de_DE.po  |    3 +
  897. | recorder.c   |   10 ++
  898. | recorder.h   |   15 ++
  899. | recording.h  |   19 +++
  900. | timers.c     |    8 +
  901. | timers.h     |    4 +
  902. | vdr.c        |   52 ++++++++-
  903. | videodir.c   |   18 +++
  904. | videodir.h   |    3 +
  905. | 21 files changed, 951 insertions(+), 7 deletions(-)
  906. | create mode 100644 livebuffer.c
  907. | create mode 100644 livebuffer.h
  908. |
  909. |diff --git a/Makefile b/Makefile
  910. |index 18d7eb9..bc49dac 100644
  911. |--- a/Makefile
  912. |+++ b/Makefile
  913. --------------------------
  914. No file to patch.  Skipping patch.
  915. 1 out of 1 hunk ignored
  916. can't find file to patch at input line 52
  917. Perhaps you used the wrong -p or --strip option?
  918. The text leading up to this was:
  919. --------------------------
  920. |diff --git a/config.c b/config.c
  921. |index 73bb00d..14146a0 100644
  922. |--- a/config.c
  923. |+++ b/config.c
  924. --------------------------
  925. No file to patch.  Skipping patch.
  926. 3 out of 3 hunks ignored
  927. can't find file to patch at input line 88
  928. Perhaps you used the wrong -p or --strip option?
  929. The text leading up to this was:
  930. --------------------------
  931. |diff --git a/config.h b/config.h
  932. |index c51e3df..1972195 100644
  933. |--- a/config.h
  934. |+++ b/config.h
  935. --------------------------
  936. No file to patch.  Skipping patch.
  937. 1 out of 1 hunk ignored
  938. can't find file to patch at input line 103
  939. Perhaps you used the wrong -p or --strip option?
  940. The text leading up to this was:
  941. --------------------------
  942. |diff --git a/device.c b/device.c
  943. |index ba098d8..172f3b3 100644
  944. |--- a/device.c
  945. |+++ b/device.c
  946. --------------------------
  947. No file to patch.  Skipping patch.
  948. 3 out of 3 hunks ignored
  949. can't find file to patch at input line 151
  950. Perhaps you used the wrong -p or --strip option?
  951. The text leading up to this was:
  952. --------------------------
  953. |diff --git a/device.h b/device.h
  954. |index fd587a8..2bebe89 100644
  955. |--- a/device.h
  956. |+++ b/device.h
  957. --------------------------
  958. No file to patch.  Skipping patch.
  959. 1 out of 1 hunk ignored
  960. can't find file to patch at input line 167
  961. Perhaps you used the wrong -p or --strip option?
  962. The text leading up to this was:
  963. --------------------------
  964. |diff --git a/dvbplayer.c b/dvbplayer.c
  965. |index 017df6d..800a31d 100644
  966. |--- a/dvbplayer.c
  967. |+++ b/dvbplayer.c
  968. --------------------------
  969. No file to patch.  Skipping patch.
  970. 9 out of 9 hunks ignored
  971. can't find file to patch at input line 304
  972. Perhaps you used the wrong -p or --strip option?
  973. The text leading up to this was:
  974. --------------------------
  975. |diff --git a/livebuffer.c b/livebuffer.c
  976. |new file mode 100644
  977. |index 0000000..afc988d
  978. |--- /dev/null
  979. |+++ b/livebuffer.c
  980. --------------------------
  981. No file to patch.  Skipping patch.
  982. 1 out of 1 hunk ignored
  983. can't find file to patch at input line 713
  984. Perhaps you used the wrong -p or --strip option?
  985. The text leading up to this was:
  986. --------------------------
  987. |diff --git a/livebuffer.h b/livebuffer.h
  988. |new file mode 100644
  989. |index 0000000..8382d7d
  990. |--- /dev/null
  991. |+++ b/livebuffer.h
  992. --------------------------
  993. No file to patch.  Skipping patch.
  994. 1 out of 1 hunk ignored
  995. can't find file to patch at input line 765
  996. Perhaps you used the wrong -p or --strip option?
  997. The text leading up to this was:
  998. --------------------------
  999. |diff --git a/menu.c b/menu.c
  1000. |index ef2bb46..621d2ce 100644
  1001. |--- a/menu.c
  1002. |+++ b/menu.c
  1003. --------------------------
  1004. No file to patch.  Skipping patch.
  1005. 19 out of 19 hunks ignored
  1006. can't find file to patch at input line 1181
  1007. Perhaps you used the wrong -p or --strip option?
  1008. The text leading up to this was:
  1009. --------------------------
  1010. |diff --git a/menu.h b/menu.h
  1011. |index ec1c175..2d55470 100644
  1012. |--- a/menu.h
  1013. |+++ b/menu.h
  1014. --------------------------
  1015. No file to patch.  Skipping patch.
  1016. 3 out of 3 hunks ignored
  1017. can't find file to patch at input line 1232
  1018. Perhaps you used the wrong -p or --strip option?
  1019. The text leading up to this was:
  1020. --------------------------
  1021. |diff --git a/osdbase.h b/osdbase.h
  1022. |index 91c5ff7..27c22b7 100644
  1023. |--- a/osdbase.h
  1024. |+++ b/osdbase.h
  1025. --------------------------
  1026. No file to patch.  Skipping patch.
  1027. 1 out of 1 hunk ignored
  1028. can't find file to patch at input line 1246
  1029. Perhaps you used the wrong -p or --strip option?
  1030. The text leading up to this was:
  1031. --------------------------
  1032. |diff --git a/player.c b/player.c
  1033. |index 3490565..9aa2956 100644
  1034. |--- a/player.c
  1035. |+++ b/player.c
  1036. --------------------------
  1037. No file to patch.  Skipping patch.
  1038. 2 out of 2 hunks ignored
  1039. can't find file to patch at input line 1275
  1040. Perhaps you used the wrong -p or --strip option?
  1041. The text leading up to this was:
  1042. --------------------------
  1043. |diff --git a/po/de_DE.po b/po/de_DE.po
  1044. |index 6d5b822..355348b 100644
  1045. |--- a/po/de_DE.po
  1046. |+++ b/po/de_DE.po
  1047. --------------------------
  1048. No file to patch.  Skipping patch.
  1049. 1 out of 1 hunk ignored
  1050. can't find file to patch at input line 1289
  1051. Perhaps you used the wrong -p or --strip option?
  1052. The text leading up to this was:
  1053. --------------------------
  1054. |diff --git a/recorder.c b/recorder.c
  1055. |index a6cab47..70e4659 100644
  1056. |--- a/recorder.c
  1057. |+++ b/recorder.c
  1058. --------------------------
  1059. No file to patch.  Skipping patch.
  1060. 3 out of 3 hunks ignored
  1061. can't find file to patch at input line 1325
  1062. Perhaps you used the wrong -p or --strip option?
  1063. The text leading up to this was:
  1064. --------------------------
  1065. |diff --git a/recorder.h b/recorder.h
  1066. |index 05cc42b..1d2aa04 100644
  1067. |--- a/recorder.h
  1068. |+++ b/recorder.h
  1069. --------------------------
  1070. No file to patch.  Skipping patch.
  1071. 1 out of 1 hunk ignored
  1072. can't find file to patch at input line 1363
  1073. Perhaps you used the wrong -p or --strip option?
  1074. The text leading up to this was:
  1075. --------------------------
  1076. |diff --git a/recording.h b/recording.h
  1077. |index 37979ec..52d57c8 100644
  1078. |--- a/recording.h
  1079. |+++ b/recording.h
  1080. --------------------------
  1081. No file to patch.  Skipping patch.
  1082. 1 out of 1 hunk ignored
  1083. can't find file to patch at input line 1394
  1084. Perhaps you used the wrong -p or --strip option?
  1085. The text leading up to this was:
  1086. --------------------------
  1087. |diff --git a/timers.c b/timers.c
  1088. |index 54ed1ba..c2298fa 100644
  1089. |--- a/timers.c
  1090. |+++ b/timers.c
  1091. --------------------------
  1092. No file to patch.  Skipping patch.
  1093. 2 out of 2 hunks ignored
  1094. can't find file to patch at input line 1422
  1095. Perhaps you used the wrong -p or --strip option?
  1096. The text leading up to this was:
  1097. --------------------------
  1098. |diff --git a/timers.h b/timers.h
  1099. |index 1d733ee..d35e042 100644
  1100. |--- a/timers.h
  1101. |+++ b/timers.h
  1102. --------------------------
  1103. No file to patch.  Skipping patch.
  1104. 1 out of 1 hunk ignored
  1105. can't find file to patch at input line 1438
  1106. Perhaps you used the wrong -p or --strip option?
  1107. The text leading up to this was:
  1108. --------------------------
  1109. |diff --git a/vdr.c b/vdr.c
  1110. |index c32e45f..b9c4460 100644
  1111. |--- a/vdr.c
  1112. |+++ b/vdr.c
  1113. --------------------------
  1114. No file to patch.  Skipping patch.
  1115. 6 out of 6 hunks ignored
  1116. can't find file to patch at input line 1542
  1117. Perhaps you used the wrong -p or --strip option?
  1118. The text leading up to this was:
  1119. --------------------------
  1120. |diff --git a/videodir.c b/videodir.c
  1121. |index 7331a85..14d4373 100644
  1122. |--- a/videodir.c
  1123. |+++ b/videodir.c
  1124. --------------------------
  1125. No file to patch.  Skipping patch.
  1126. 2 out of 2 hunks ignored
  1127. can't find file to patch at input line 1589
  1128. Perhaps you used the wrong -p or --strip option?
  1129. The text leading up to this was:
  1130. --------------------------
  1131. |diff --git a/videodir.h b/videodir.h
  1132. |index 5e9aef5..57b8652 100644
  1133. |--- a/videodir.h
  1134. |+++ b/videodir.h
  1135. --------------------------
  1136. No file to patch.  Skipping patch.
  1137. 1 out of 1 hunk ignored
  1138.  
  1139. patch program exited with status 1