The attached patch allows a VDR system with multiple cards to attach each card to an individual dish pointing at a different satellite.
I have 3 DVB cards in my VDR system:
1) FF card connected to one output of LNB at a dish pointed at Astra 19.2E.
2) budget card connected to another output of LNB at a dish pointed at Astra 19.2E.
3) budget card connected to output of LNB at a dish pointed at Eutelsat 13.0E.
I am using the following entries for that in my setup.conf:
SourceCaps = 1 S19.2E SourceCaps = 2 S19.2E SourceCaps = 3 S13.0E
Hi!
Carsten Koch schrieb:
The attached patch allows a VDR system with multiple cards to attach each card to an individual dish pointing at a different satellite.
Thank you for the great patch, but with this version I get the following on a plain vdr-1.3.33: (BTW, if you wonder about the naming: it is really your patch ... I just renamed it)
vdrNG vdr_plain # cat ../VDR/PATCHES/vdr-1.3.33-SourceCaps.patch | patch -p1 --dry-run patching file config.c Hunk #1 FAILED at 15. Hunk #2 FAILED at 301. Hunk #3 FAILED at 404. Hunk #4 FAILED at 504. Hunk #5 FAILED at 570. 5 out of 5 hunks FAILED -- saving rejects to file config.c.rej patching file config.h Hunk #1 FAILED at 30. Hunk #2 FAILED at 201. Hunk #3 FAILED at 257. 3 out of 3 hunks FAILED -- saving rejects to file config.h.rej patching file device.c Hunk #1 FAILED at 174. Hunk #2 FAILED at 315. 2 out of 2 hunks FAILED -- saving rejects to file device.c.rej patching file device.h Hunk #1 FAILED at 23. Hunk #2 FAILED at 132. Hunk #3 FAILED at 141. 3 out of 3 hunks FAILED -- saving rejects to file device.h.rej patching file dvbdevice.c Hunk #1 FAILED at 754. 1 out of 1 hunk FAILED -- saving rejects to file dvbdevice.c.rej
Andreas Brugger wrote: ...
Thank you for the great patch, but with this version I get the following on a plain vdr-1.3.33:
...
Hunk #1 FAILED at 15.
I tested it again here. Works just fine:
/tmp/vdr-1.3.33> patch <../SourceCaps-1.3.33.patch patching file config.c patching file config.h patching file device.c patching file device.h patching file dvbdevice.c /tmp/vdr-1.3.33> ls -l ../SourceCaps-1.3.33.patch -rw-r--r-- 1 cko users 7355 Sep 26 20:01 ../SourceCaps-1.3.33.patch
Is your SourceCaps-1.3.33.patch 7355 bytes long?
Carsten.
Carsten Koch schrieb:
I tested it again here. Works just fine:
Very funny thing. If I copy the patch-file from the message, I get an other patch than if I copy the text in the message ... This has to be a bug of Thunderbird (win-version) or samba or I don't know. Maybe it's just another format ... Now it worked.
Is your SourceCaps-1.3.33.patch 7355 bytes long?
If I copy the file it is 7559 Bytes, if I copy the text of the patch and paste it to a file it is 7358 Bytes ... Maybe I'm just too tired today. ;-)
Thanks for the help.
En/na Andreas Brugger ha escrit:
Carsten Koch schrieb:
I tested it again here. Works just fine:
Very funny thing. If I copy the patch-file from the message, I get an other patch than if I copy the text in the message ... This has to be a bug of Thunderbird (win-version) or samba or I don't know.
If you "save as.." the attached file, you should get the same file, no matter if it is windows or linux. If you copy and paste under windows you'll get a different file (windows uses cr+lf as a line terminator while unix just uses lf).
Bye
Luca Olivetti wrote:
If you "save as.." the attached file, you should get the same file, no matter if it is windows or linux.
Unfortunately, not. If the file is attached as plain text, eg. not base64 encoded, then line endings may be converted to platform default, and may even be converted while passing through mail servers.
However, GNU patch is smart enough to detect CRLF diffs and and to convert them to proper LF diffs.
The only safe way is to attach it as .diff.gz to force base64 encoding.
Cheers,
Udo
Udo Richter wrote:
Luca Olivetti wrote:
If you "save as.." the attached file, you should get the same file, no matter if it is windows or linux.
Unfortunately, not. If the file is attached as plain text, eg. not base64 encoded, then line endings may be converted to platform default, and may even be converted while passing through mail servers.
However, GNU patch is smart enough to detect CRLF diffs and and to convert them to proper LF diffs.
The only safe way is to attach it as .diff.gz to force base64 encoding.
Cheers,
Udo
If somebody posts a patch for plain VDR, please do it as a plain text diff file attachment. This allows me to see it directly in the mail reader, without having to extract and unzip it first. It also allows me to search my mailbox in case I'm looking for things to do, and reach into the diff attachments. If I have to first extract and unzip a diff, I tend to postpone it to later... ;-)
Klaus