Hello HelmutB †, was trying to update from 2.4.1 to 2.4.4. Downloaded the patch but I cannot get it to apply cleanly. Am I doing something wrong?
Diff
root@timeshift:/home/timeshift/Nedlastinger/vdr-2.4.4# patch < ../camtweaks-patch/vdr-2.4.4-camtweaks-2.4.1_scaForceNewCat.patch
patching file ci.c
Hunk #1 succeeded at 117 (offset -6 lines).
Hunk #2 succeeded at 149 (offset -6 lines).
Hunk #3 succeeded at 208 with fuzz 1 (offset -7 lines).
Hunk #4 FAILED at 279.
1 out of 4 hunks FAILED -- saving rejects to file ci.c.rej
root@timeshift:/home/timeshift/Nedlastinger/vdr-2.4.4# cat ci.c.rej
--- ci.c.orig 2020-07-16 20:59:06.930115072 +0200
+++ ci.c 2020-07-17 17:34:51.073445956 +0200
@@ -279,6 +282,11 @@ void cCaPidReceiver::Receive(const uchar
}
}
if (MtdCamSlot || ScaMapper) {
+ if (scaForceNewCat) {
+ catVersion = (catVersion + 0xF) & 0x1F; // pretend a version change
+ uchar *c = const_cast<uchar *>(p + 5);
+ *c = (*c & ~0x3E) | (catVersion << 1); // patch version
+ }
// update crc32
uint32_t crc = SI::CRC32::crc32((const char *)p, length - 4, 0xFFFFFFFF); // <TableIdCAT....>[crc32]
uchar *c = const_cast<uchar *>(p + length - 4);
Thanks! 