[mythtv] Regarding ticket 5866: mpegrecorder-hdpvr-v2.patch patch no longer applies to trunk
Ian Forde
ian at duckland.org
Tue Jan 20 10:36:42 UTC 2009
I updated to 19715 a few days ago, and realized after a few days of
hdpvr instability, that I forgot to apply the
DeviceReadBuffer-polltimeout.2.patch, mpegrecorder-hdpvr-v2.patch, and
hdpvr-livetv.patch patches to my source tree.
First one applies, 2nd one breaks with:
[root at tatooine mythtv]# patch -p0
< ../../DeviceReadBuffer-polltimeout.2.patch
patching file libs/libmythtv/DeviceReadBuffer.h
patching file libs/libmythtv/DeviceReadBuffer.cpp
[root at tatooine mythtv]# patch -p0 < ../../mpegrecorder-hdpvr-v2.patch
patching file libs/libmythtv/mpegrecorder.h
patching file libs/libmythtv/mpegrecorder.cpp
Hunk #2 FAILED at 87.
Hunk #3 succeeded at 494 (offset 6 lines).
Hunk #5 succeeded at 535 (offset 6 lines).
Hunk #7 succeeded at 599 (offset 6 lines).
Hunk #9 succeeded at 819 (offset 6 lines).
Hunk #11 succeeded at 876 (offset 6 lines).
Hunk #13 succeeded at 1139 (offset 6 lines).
Hunk #15 succeeded at 1300 (offset 6 lines).
Hunk #17 succeeded at 1462 (offset 8 lines).
Hunk #19 succeeded at 1581 (offset 8 lines).
Hunk #21 succeeded at 1612 (offset 8 lines).
Hunk #23 succeeded at 1700 (offset 8 lines).
1 out of 24 hunks FAILED -- saving rejects to file
libs/libmythtv/mpegrecorder.cpp.rej
patching file libs/libmythtv/DeviceReadBuffer.h
patching file libs/libmythtv/DeviceReadBuffer.cpp
[root at tatooine mythtv]#
The 3rd one applies cleanly. The rej file reads as follows:
[root at tatooine libmythtv]# more mpegrecorder.cpp.rej
***************
*** 86,92 ****
requires_special_pause(false),
// State
recording(false), encoding(false),
- needs_resolution(false),
start_stop_encoding_lock(QMutex::Recursive),
recording_wait_lock(), recording_wait(),
// Pausing state
cleartimeonpause(false),
--- 87,93 ----
requires_special_pause(false),
// State
recording(false), encoding(false),
+ start_stop_encoding_lock(QMutex::Recursive),
recording_wait_lock(), recording_wait(),
// Pausing state
cleartimeonpause(false),
[root at tatooine libmythtv]#
-I
More information about the mythtv-dev
mailing list