[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1
etobi
git at e-tobi.net
Sat Mar 31 11:28:01 UTC 2012
The following commit has been merged in the e-tobi branch:
commit 9cc017dcc23727417b28116300bafc7f423ebacb
Author: etobi <git at e-tobi.net>
Date: Sun Mar 11 19:54:53 2012 +0100
Dropped opt-21_internal-cam-devices.patch (doesn't apply anmore)
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 3877674..c8bce03 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,22 +1,21 @@
debian/patches/opt-20_liemikuutio.patch:34c4538bc61cd6e36de8aee9cced623f
+debian/patches/opt-27_ttxtsubs.patch:20323eb5d6ec0a8240163ca91e0e9da6
+debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
+debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
+debian/patches/opt-38_disableDoubleEpgEntrys.patch:c637b1551cb497a5d63d963849198025
+debian/patches/opt-45_yaepg.patch:8e9c35a5b9224381cfc8936f0de2fe48
debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
+debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
+debian/patches/opt-24_jumpplay.patch:eaad9557412bc6977b38c76acb988d33
+debian/patches/opt-41-x_timer-info.patch:24767586707d76f36e33021d3e662508
debian/patches/opt-43-x_recordshowfree.patch:e215d4b880638dd97deb138a36abc9e1
debian/patches/opt-42-x_MainMenuHooks.patch:e08533a7b9ee8702272477ad3b8002c0
-debian/patches/opt-27_ttxtsubs.patch:20323eb5d6ec0a8240163ca91e0e9da6
+debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
+debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
debian/patches/opt-50_graphtft.patch:89b222a6d29eede764163c8806a07dd3
debian/patches/opt-37-x_menuorg.patch:715f69aea51c02b541c7c86c1d6723a8
-debian/patches/opt-21_internal-cam-devices.patch:3f3a00b67bdaf671fe3155d0f9c72ad1
-debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
-debian/patches/opt-41-x_timer-info.patch:24767586707d76f36e33021d3e662508
-debian/patches/opt-24_jumpplay.patch:eaad9557412bc6977b38c76acb988d33
-debian/patches/opt-38_disableDoubleEpgEntrys.patch:c637b1551cb497a5d63d963849198025
-debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
-debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
debian/patches/opt-22-x_edit_marks.patch:9d4f8fbfd9f841a809f8d9f4eebd01a4
-debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
-debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
-debian/patches/opt-45_yaepg.patch:8e9c35a5b9224381cfc8936f0de2fe48
-debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
+debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
diff --git a/debian/changelog b/debian/changelog
index f5526d1..0432931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ vdr (1.7.26-1~ctvdr1) unstable; urgency=low
* Updated debianize-vdrplugin to use the debhelper V7 format
* Upgraded opt-20_liemikuutio.dpatch to version 1.34
* Dropped opt-39_noepg.patch (not required anymore)
+ * Dropped opt-21_internal-cam-devices.patch (doesn't apply anmore)
-- Tobias Grimm <etobi at debian.org> Sun, 19 Feb 2012 17:21:08 +0100
diff --git a/debian/patches/opt-21_internal-cam-devices.patch b/debian/patches/opt-21_internal-cam-devices.patch
deleted file mode 100644
index d8e8b28..0000000
--- a/debian/patches/opt-21_internal-cam-devices.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: This patch allows tuning to encrypted channels which are
- provided by a stremdev client device and therefore already are
- decrypted on the streamdev server side.
- See also: http://www.vdr-developer.org/mantisbt/view.php?id=429
-Author: Tobias Grimm <tg at e-tobi.net>
-
-Index: vdr/device.c
-===================================================================
---- vdr.orig/device.c 2011-12-11 02:29:03.000000000 +0100
-+++ vdr/device.c 2011-12-11 02:29:08.000000000 +0100
-@@ -238,6 +238,7 @@
- int NumCamSlots = CamSlots.Count();
- int SlotPriority[NumCamSlots];
- int NumUsableSlots = 0;
-+ bool InternalCamNeeded = false;
- if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
- for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
- SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
-@@ -251,7 +252,7 @@
- }
- }
- if (!NumUsableSlots)
-- return NULL; // no CAM is able to decrypt this channel
-+ InternalCamNeeded = true; // no CAM is able to decrypt this channel
- }
-
- bool NeedsDetachReceivers = false;
-@@ -267,11 +268,13 @@
- continue; // this device shall be temporarily avoided
- if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
- continue; // a specific card was requested, but not this one
-- if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
-+ if (InternalCamNeeded && !device[i]->HasInternalCam())
-+ continue; // no CAM is able to decrypt this channel and the device uses vdr handled CAMs
-+ if (NumUsableSlots && !device[i]->HasInternalCam() && !CamSlots.Get(j)->Assign(device[i], true))
- continue; // CAM slot can't be used with this device
- bool ndr;
- if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
-- if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
-+ if (NumUsableSlots && !device[i]->HasInternalCam() && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
- ndr = true; // using a different CAM slot requires detaching receivers
- // Put together an integer number that reflects the "impact" using
- // this device would have on the overall system. Each condition is represented
-@@ -285,19 +288,19 @@
- imp <<= 1; imp |= device[i]->Receiving(); // avoid devices that are receiving
- imp <<= 4; imp |= GetClippedNumProvidedSystems(4, device[i]) - 1; // avoid cards which support multiple delivery systems
- imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice(); // avoid the Transfer Mode receiver device
-- imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
- imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
-+ imp <<= 8; imp |= min(max(((NumUsableSlots && !device[i]->HasInternalCam()) ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
- imp <<= 1; imp |= ndr; // avoid devices if we need to detach existing receivers
-- imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi(); // avoid cards with Common Interface for FTA channels
-+ imp <<= 1; imp |= (NumUsableSlots || InternalCamNeeded) ? 0 : device[i]->HasCi(); // avoid cards with Common Interface for FTA channels
- imp <<= 1; imp |= device[i]->AvoidRecording(); // avoid SD full featured cards
-- imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
-+ imp <<= 1; imp |= (NumUsableSlots && !device[i]->HasInternalCam()) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
- imp <<= 1; imp |= device[i]->IsPrimaryDevice(); // avoid the primary device
- if (imp < Impact) {
- // This device has less impact than any previous one, so we take it.
- Impact = imp;
- d = device[i];
- NeedsDetachReceivers = ndr;
-- if (NumUsableSlots)
-+ if (NumUsableSlots && !device[i]->HasInternalCam())
- s = CamSlots.Get(j);
- }
- }
-Index: vdr/device.h
-===================================================================
---- vdr.orig/device.h 2011-12-10 22:22:04.000000000 +0100
-+++ vdr/device.h 2011-12-11 02:29:08.000000000 +0100
-@@ -395,6 +395,13 @@
- public:
- virtual bool HasCi(void);
- ///< Returns true if this device has a Common Interface.
-+#define INTERNAL_CAM_DEVICES_PATCH 1
-+ virtual bool HasInternalCam(void) { return false; }
-+ ///< Returns true if this device handles encrypted channels itself
-+ ///< without VDR assistance. This can be e.g. when the device is a
-+ ///< client that gets the stream from another VDR instance that has
-+ ///< already decrypted the stream. In this case ProvidesChannel()
-+ ///< shall check whether the channel can be decrypted.
- void SetCamSlot(cCamSlot *CamSlot);
- ///< Sets the given CamSlot to be used with this device.
- cCamSlot *CamSlot(void) const { return camSlot; }
diff --git a/debian/patches/series b/debian/patches/series
index 5416dbd..58878c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,10 +13,6 @@
# Patch collection (replaces enAIO).
opt-20_liemikuutio.patch
-# Allows to tune to non-FTA channels provided by internal devices,
-# like streamdev
-opt-21_internal-cam-devices.patch
-
# Easy editing of cutting marks
# (Requires opt-20_liemikuutio!)
opt-22-x_edit_marks.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list