summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-05-21 11:51:20 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-05-21 11:51:20 +0000
commitf70f85918f98249bdddff13bcf516ecdc4b311d9 (patch)
treead611db53496d8d628fdf442541adc8994bbe851 /media-plugins/vdr-reelchannelscan
parentalpha stable wrt #169094 (diff)
downloadhistorical-f70f85918f98249bdddff13bcf516ecdc4b311d9.tar.gz
historical-f70f85918f98249bdddff13bcf516ecdc4b311d9.tar.bz2
historical-f70f85918f98249bdddff13bcf516ecdc4b311d9.zip
Fixed wrong assumption device-nr == card-nr. Added translations, and defaulting to astra in case channel-list is empty.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'media-plugins/vdr-reelchannelscan')
-rw-r--r--media-plugins/vdr-reelchannelscan/ChangeLog12
-rw-r--r--media-plugins/vdr-reelchannelscan/Manifest48
-rw-r--r--media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff13
-rw-r--r--media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff174
-rw-r--r--media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff78
-rw-r--r--media-plugins/vdr-reelchannelscan/files/0.4.3/series3
-rw-r--r--media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r2 (renamed from media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1)0
-rw-r--r--media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild (renamed from media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild)5
8 files changed, 313 insertions, 20 deletions
diff --git a/media-plugins/vdr-reelchannelscan/ChangeLog b/media-plugins/vdr-reelchannelscan/ChangeLog
index 9f199593c103..028d9adf62aa 100644
--- a/media-plugins/vdr-reelchannelscan/ChangeLog
+++ b/media-plugins/vdr-reelchannelscan/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for media-plugins/vdr-reelchannelscan
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.10 2007/05/21 10:12:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.11 2007/05/21 11:51:20 zzam Exp $
+
+*vdr-reelchannelscan-0.4.3-r2 (21 May 2007)
+
+ 21 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/0.4.3/default-source-if-no-channel-set.diff,
+ +files/0.4.3/i18n.diff, +files/0.4.3/device-numbering.diff,
+ files/0.4.3/series, -vdr-reelchannelscan-0.4.3-r1.ebuild,
+ +vdr-reelchannelscan-0.4.3-r2.ebuild:
+ Fixed wrong assumption device-nr == card-nr. Added translations, and
+ defaulting to astra in case channel-list is empty.
*vdr-reelchannelscan-0.4.3-r1 (21 May 2007)
diff --git a/media-plugins/vdr-reelchannelscan/Manifest b/media-plugins/vdr-reelchannelscan/Manifest
index 3ec513572dc7..3e5e95f5f3b3 100644
--- a/media-plugins/vdr-reelchannelscan/Manifest
+++ b/media-plugins/vdr-reelchannelscan/Manifest
@@ -1,28 +1,40 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX 0.4.3/default-source-if-no-channel-set.diff 609 RMD160 3e3feeff2a6a78e92bbe15de1b826939703085e9 SHA1 eeb2c43231c4caad75e9ab753ed24a992259df03 SHA256 30f99ee90b01cb6d75b04ef31ff5ffb0dc3fc3c34a652e2d7b9562ce94f6ac39
+MD5 d365a29864a398b19ddb80f1eaa487e2 files/0.4.3/default-source-if-no-channel-set.diff 609
+RMD160 3e3feeff2a6a78e92bbe15de1b826939703085e9 files/0.4.3/default-source-if-no-channel-set.diff 609
+SHA256 30f99ee90b01cb6d75b04ef31ff5ffb0dc3fc3c34a652e2d7b9562ce94f6ac39 files/0.4.3/default-source-if-no-channel-set.diff 609
+AUX 0.4.3/device-numbering.diff 5380 RMD160 96026bc6966b314137c4ea450fc4befef9e82817 SHA1 d2e2b28fe37d065092be63ea7392c99f4c702185 SHA256 4febae127f5afd481867173d4bb65bea2013ec92c864a258019e70164a7d2561
+MD5 1d2b1dbb9990b4a1406c3efb31ddfce0 files/0.4.3/device-numbering.diff 5380
+RMD160 96026bc6966b314137c4ea450fc4befef9e82817 files/0.4.3/device-numbering.diff 5380
+SHA256 4febae127f5afd481867173d4bb65bea2013ec92c864a258019e70164a7d2561 files/0.4.3/device-numbering.diff 5380
AUX 0.4.3/gentoo.diff 463 RMD160 afcd1cdf38af25dd4207e7cd6509430f7c1287a5 SHA1 79de68564e93420c1adaeb526be6306bd4cb9cb5 SHA256 a8370eaf1454a4c7f2c592c2d8549946fb3d6032f6ccdcc50edcc98e3fe3b095
MD5 3c9f3538c76d171506a85dc2a762d6ef files/0.4.3/gentoo.diff 463
RMD160 afcd1cdf38af25dd4207e7cd6509430f7c1287a5 files/0.4.3/gentoo.diff 463
SHA256 a8370eaf1454a4c7f2c592c2d8549946fb3d6032f6ccdcc50edcc98e3fe3b095 files/0.4.3/gentoo.diff 463
-AUX 0.4.3/series 12 RMD160 a058d20554898eb810c1f0291b2ce54221d23247 SHA1 5e2acc52a0d2c946d874463f04cd5dfa019c2d37 SHA256 983da065be2d06c0360d0e89b34c34d9ea3354740b77319ac8016e81f7453653
-MD5 71386fe57f3966516e7f06a25c9dec99 files/0.4.3/series 12
-RMD160 a058d20554898eb810c1f0291b2ce54221d23247 files/0.4.3/series 12
-SHA256 983da065be2d06c0360d0e89b34c34d9ea3354740b77319ac8016e81f7453653 files/0.4.3/series 12
+AUX 0.4.3/i18n.diff 1442 RMD160 d96f58eae21f71318cdfb244a17b23f0ccb9d0c4 SHA1 0cf6d7fbfebc56a3dd49ca17c0ea6f4754711af9 SHA256 b9ea042c91451f2fcf7699814ed4e87956e98c85a32cb4918a51d57bc59dd6f7
+MD5 158ec22a194955c761d50888f33c81e3 files/0.4.3/i18n.diff 1442
+RMD160 d96f58eae21f71318cdfb244a17b23f0ccb9d0c4 files/0.4.3/i18n.diff 1442
+SHA256 b9ea042c91451f2fcf7699814ed4e87956e98c85a32cb4918a51d57bc59dd6f7 files/0.4.3/i18n.diff 1442
+AUX 0.4.3/series 82 RMD160 6536c2d6720c45b94581072da8824e3450a5448f SHA1 3fe661d3874617a7bd76d1cf280205ba985d3f56 SHA256 f503451f6c2fefdf2e3954d276be4e27fcfb622fb353c31f9e5b851e8bbd3117
+MD5 26fcbee5e6fbc3e284ba87ae167b4cb4 files/0.4.3/series 82
+RMD160 6536c2d6720c45b94581072da8824e3450a5448f files/0.4.3/series 82
+SHA256 f503451f6c2fefdf2e3954d276be4e27fcfb622fb353c31f9e5b851e8bbd3117 files/0.4.3/series 82
DIST vdr-reelchannelscan-0.3.3.tgz 69313 RMD160 bcdb3327d610f27045e4cb0fc8d8bb82c1030fec SHA1 db24e7e35c70129b6e1aedf3e87f36bc8a9f624f SHA256 8ed4e17d456b881da1646f1963c189723f84351753460c96e8c3b56b3deab305
DIST vdr-reelchannelscan-0.4.3.tgz 84785 RMD160 a498de279c406527a44295d9e6331de69606c390 SHA1 adf6db4991577e67421c181f71dad1a7d57d2f3b SHA256 d8ac8dd1f3792ef3d5ddf8a62de528dea3d8980becf658c6cc0887a5f67fe2f9
EBUILD vdr-reelchannelscan-0.3.3.ebuild 1036 RMD160 681f6b63d97045d9c4ca9412d773084befb7edfa SHA1 490c71421c755b47f837713674eb272c0dff26b1 SHA256 7d5f0a58cdc8b1187ca954e5830522da00f9614a6e861646ff2e04cc81def20a
MD5 b569617e29e9cfe8063e0f9a1ea32892 vdr-reelchannelscan-0.3.3.ebuild 1036
RMD160 681f6b63d97045d9c4ca9412d773084befb7edfa vdr-reelchannelscan-0.3.3.ebuild 1036
SHA256 7d5f0a58cdc8b1187ca954e5830522da00f9614a6e861646ff2e04cc81def20a vdr-reelchannelscan-0.3.3.ebuild 1036
-EBUILD vdr-reelchannelscan-0.4.3-r1.ebuild 996 RMD160 03fc7780a698b63f2c8e30595c0e953a91f9a118 SHA1 eed8aeeb2b835dac080f44503a1063dbf8fba7ab SHA256 637b05892a09ea3f135dbe3f1fdad85aa28c071a3f5199044ec208a12e1f0f71
-MD5 6011eaf1ce60acb0cb1e3c3be7921abe vdr-reelchannelscan-0.4.3-r1.ebuild 996
-RMD160 03fc7780a698b63f2c8e30595c0e953a91f9a118 vdr-reelchannelscan-0.4.3-r1.ebuild 996
-SHA256 637b05892a09ea3f135dbe3f1fdad85aa28c071a3f5199044ec208a12e1f0f71 vdr-reelchannelscan-0.4.3-r1.ebuild 996
-MISC ChangeLog 2131 RMD160 110c68b1287906e966915e51b225ce5154b895ec SHA1 840b95afba4f47897a62bb61f65d3e61057de295 SHA256 68e6d5aa07cd9e1bd3c57b9e66ae418148cf888f498d5a8e36f5890060dc4fdd
-MD5 9423afba14886e26acceb27a6e7abe72 ChangeLog 2131
-RMD160 110c68b1287906e966915e51b225ce5154b895ec ChangeLog 2131
-SHA256 68e6d5aa07cd9e1bd3c57b9e66ae418148cf888f498d5a8e36f5890060dc4fdd ChangeLog 2131
+EBUILD vdr-reelchannelscan-0.4.3-r2.ebuild 1150 RMD160 49c7d15b47fab332de84cbb92fc7f2affe91959e SHA1 bc54faa127c29159bab7a037990a9e8a943344d5 SHA256 62b21c421237dba5ce978b2c2a299e91887e669b4c0c78a73bcb7835ee75fcfc
+MD5 532000ca8ef443e1cdf493449ebdf03d vdr-reelchannelscan-0.4.3-r2.ebuild 1150
+RMD160 49c7d15b47fab332de84cbb92fc7f2affe91959e vdr-reelchannelscan-0.4.3-r2.ebuild 1150
+SHA256 62b21c421237dba5ce978b2c2a299e91887e669b4c0c78a73bcb7835ee75fcfc vdr-reelchannelscan-0.4.3-r2.ebuild 1150
+MISC ChangeLog 2570 RMD160 e530ca93573a1076be70090237d7962618b4261a SHA1 f5bc99a171b118af14d732adc19950aec74e5696 SHA256 0650699024475190ee3c5ec15ee55651e466285bc2b55a0479704dee40a36fe6
+MD5 beb8f76ba7d3ce8f9116cd65d3645e5e ChangeLog 2570
+RMD160 e530ca93573a1076be70090237d7962618b4261a ChangeLog 2570
+SHA256 0650699024475190ee3c5ec15ee55651e466285bc2b55a0479704dee40a36fe6 ChangeLog 2570
MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231
MD5 99b79afc01e96944c8afdb90ccc03cab metadata.xml 309
RMD160 2564df04af9eead2fe189df8286f0d005570353a metadata.xml 309
@@ -30,13 +42,13 @@ SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231 metadata
MD5 40025e71f21866cdc5d726277b0bb9ff files/digest-vdr-reelchannelscan-0.3.3 265
RMD160 1f5525bc2faf9128ea1457b4ce4bb87a127c6089 files/digest-vdr-reelchannelscan-0.3.3 265
SHA256 c15af2466be6d88c81899a9b6a79e47b159ad9a5d08184b82ab8786c65aea0d6 files/digest-vdr-reelchannelscan-0.3.3 265
-MD5 dc954ffb6f64a5c084bbb5d36e641eff files/digest-vdr-reelchannelscan-0.4.3-r1 265
-RMD160 1a2f933e9db1935877f4f3808b7d828c8c90ae07 files/digest-vdr-reelchannelscan-0.4.3-r1 265
-SHA256 3a183d9e43786ddff7bf1f4ec801b5601020d1058a22023aa846edd82dc0b5bf files/digest-vdr-reelchannelscan-0.4.3-r1 265
+MD5 dc954ffb6f64a5c084bbb5d36e641eff files/digest-vdr-reelchannelscan-0.4.3-r2 265
+RMD160 1a2f933e9db1935877f4f3808b7d828c8c90ae07 files/digest-vdr-reelchannelscan-0.4.3-r2 265
+SHA256 3a183d9e43786ddff7bf1f4ec801b5601020d1058a22023aa846edd82dc0b5bf files/digest-vdr-reelchannelscan-0.4.3-r2 265
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGUXClt2vP6XvVdOcRAikgAJ0drMn7aHKNp9SzSTPq+dtl0TUZ3ACeP6rk
-IDN/4PNNNIkezo+qkgaElNo=
-=Yv2v
+iD8DBQFGUYfEt2vP6XvVdOcRApWpAKCMnKMBg8xsyORmfdSqG+vySz70qgCgskGQ
+Fk5hSgzFUdrWL7iMiqrb67g=
+=tpa5
-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff
new file mode 100644
index 000000000000..849b4ce30bbf
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff
@@ -0,0 +1,13 @@
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -241,7 +241,7 @@ void cMenuChannelscan::Set()
+
+ // avoid C/T-positions for SAT
+ // and take Astra as start position
+- if (srcTypes[sourceStat]==SAT && (source==cSource::FromString("C") || source==cSource::FromString("T")))
++ if (srcTypes[sourceStat]==SAT && (source==cSource::FromString("C") || source==cSource::FromString("T") || source==0))
+ source = cSource::FromString("S19.2E");
+
+ int blankLines = 4;
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff
new file mode 100644
index 000000000000..4de4dcc572ac
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff
@@ -0,0 +1,174 @@
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -190,26 +190,27 @@ void cMenuChannelscan::TunerDetection()
+ {
+
+ int stp=0;
+- for (int i=0;i<4;i++)
++ for (int i=0;i<cDevice::NumDevices();i++)
+ {
+ cDevice *device = cDevice::GetDevice(i);
+- srcTexts[i]=NULL;
++ srcTexts[srcTuners]=NULL;
+ if (device) {
+ char *txt=NULL;
+ if (device->ProvidesSource(cSource::stTerr)) {
+- asprintf(&txt,"%s (%s %i)",tr("DVB-T - Terrestrial"),tr("Tuner"),i+1);
++ asprintf(&txt,"%s (%s %i)",tr("DVB-T - Terrestrial"),tr("Tuner"),srcTuners+1);
+ stp=TERR;
+ }
+ else if (device->ProvidesSource(cSource::stCable)) {
+- asprintf(&txt,"%s (%s %i)",tr("DVB-C - Cable"),tr("Tuner"),i+1);
++ asprintf(&txt,"%s (%s %i)",tr("DVB-C - Cable"),tr("Tuner"),srcTuners+1);
+ stp=CABLE;
+ }
+ else if (device->ProvidesSource(cSource::stSat)) {
+- asprintf(&txt,"%s (%s %i)",tr("DVB-S - Satellite"),tr("Tuner"),i+1);
++ asprintf(&txt,"%s (%s %i)",tr("DVB-S - Satellite"),tr("Tuner"),srcTuners+1);
+ stp=SAT;
+ }
+ if (txt) {
+ srcTypes[srcTuners]=stp;
++ srcDeviceNr[srcTuners]=i;
+ srcTexts[srcTuners++]=txt;
+ }
+ }
+@@ -417,9 +418,9 @@ eOSState cMenuChannelscan::ProcessKey(eK
+
+ sourceType=srcTypes[sourceStat];
+
+- scp.card = sourceStat;
++ scp.deviceNr = srcDeviceNr[sourceStat];
+ scp.type=sourceType;
+- scp.source =
++ scp.source = source;
+ scp.bandwidth = bandwidth;
+ scp.polarization = polarization;
+ scp.symbolrate = symbolrate;
+@@ -573,7 +574,7 @@ cMenuScanActive::cMenuScanActive(scanPar
+ // auto_ptr
+ Scan.reset(new cScan());
+
+- isyslog (" start Scanning @ Card %d --- ", scp->card);
++ isyslog (" start Scanning @ Card %d --- ", scp->deviceNr);
+ if (!Scan->StartScanning(scp))
+ {
+ esyslog (ERR " Tuner Error");
+Index: reelchannelscan-0.4.3/csmenu.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.h
++++ reelchannelscan-0.4.3/csmenu.h
+@@ -51,8 +51,9 @@ private:
+ int source;
+ int frequency;
+ int symbolrate;
+- char *srcTexts[4];
+- int srcTypes[4];
++ char *srcTexts[MAXDEVICES];
++ int srcTypes[MAXDEVICES];
++ int srcDeviceNr[MAXDEVICES];
+ int srcTuners;
+ const char *fecTexts[10];
+ const char *modTexts[10];
+Index: reelchannelscan-0.4.3/scan.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/scan.c
++++ reelchannelscan-0.4.3/scan.c
+@@ -38,7 +38,7 @@ cScan::cScan()
+
+ newChannels = 0;
+ fd_frontend= -1;
+- cardnr = -1;
++ devicenr = -1;
+ transponderNr = 0;
+ channelNumber = 0;
+ frequency = 0;
+@@ -70,26 +70,26 @@ cScan::~cScan()
+
+ if (NFilter)
+ {
+- cDevice::GetDevice(cardnr)->Detach(NFilter);
++ cDevice::GetDevice(devicenr)->Detach(NFilter);
+ delete NFilter;
+ NFilter=NULL;
+ }
+
+ if (PFilter)
+ {
+- cDevice::GetDevice(cardnr)->Detach(PFilter);
++ cDevice::GetDevice(devicenr)->Detach(PFilter);
+ delete PFilter;
+ PFilter=NULL;
+ }
+ if (SFilter)
+ {
+- cDevice::GetDevice(cardnr)->Detach(SFilter);
++ cDevice::GetDevice(devicenr)->Detach(SFilter);
+ delete SFilter;
+ SFilter=NULL;
+ }
+ if (EFilter)
+ {
+- cDevice::GetDevice(cardnr)->Detach(EFilter);
++ cDevice::GetDevice(devicenr)->Detach(EFilter);
+ delete EFilter;
+ EFilter=NULL;
+ }
+@@ -144,8 +144,9 @@ bool cScan::StartScanning(scanParameters
+
+ cDevice::PrimaryDevice()->StopReplay();
+
+- cardnr = scp->card;
+- DLOG (DBG " Stop Replay Card Number %d", cardnr);
++ devicenr = scp->deviceNr;
++ int cardnr = cDevice::GetDevice(devicenr)->CardIndex();
++ DLOG (DBG " Stop Replay Card Number %d", deviceNr);
+
+ scanning_on_receiving_device=true;
+
+@@ -330,7 +331,7 @@ void cScan::ScanDVB_S(cTransponder *tp,
+ }
+ #endif
+ }
+- else if (cDevice::GetDevice(cardnr)->HasLock(DVBS_LOCK_TIMEOUT))
++ else if (cDevice::GetDevice(devicenr)->HasLock(DVBS_LOCK_TIMEOUT))
+ {
+ if (cMenuChannelscan::scanState == ssGetTransponders) {
+ ScanNitServices();
+@@ -500,7 +501,7 @@ void cScan::Action()
+ // the one and only "scanning = true" !
+ // cMenuChannelscan::scanning = true;
+
+- device = cDevice::GetDevice(cardnr);
++ device = cDevice::GetDevice(devicenr);
+ std::auto_ptr<cChannel> c(new cChannel);
+
+ cTransponders &transponders = cTransponders::GetInstance();
+Index: reelchannelscan-0.4.3/scan.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/scan.h
++++ reelchannelscan-0.4.3/scan.h
+@@ -62,7 +62,7 @@ private:
+ int origUpdateChannels;
+ bool nitScan;
+ int sourceCode; // internal VDR Code for dvb Sources see vdr/sources.c
+- int cardnr;
++ int devicenr;
+ int transponderNr;
+ int channelNumber;
+ int frequency;
+Index: reelchannelscan-0.4.3/transponders.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/transponders.h
++++ reelchannelscan-0.4.3/transponders.h
+@@ -39,7 +39,7 @@ namespace setup
+ #endif
+
+ typedef struct {
+- int card;
++ int deviceNr;
+ int type;
+ int source;
+ int frequency; // 0: Full band scan
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
new file mode 100644
index 000000000000..dc014bdfc5fe
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
@@ -0,0 +1,78 @@
+Index: reelchannelscan-0.4.3/i18n.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/i18n.c
++++ reelchannelscan-0.4.3/i18n.c
+@@ -207,6 +207,28 @@
+ "", // Dansk
+ "", // Èesky (Czech)
+ },
++ { "SearchMode$Auto NIT",
++ "NIT Automatik",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "", // Hrvatski (Croatian)
++ "", // Eesti
++ "", // Dansk
++ "", // Èesky (Czech)
++ },
+ { "Manual",
+ "Manuell",
+ "",
+@@ -317,6 +339,28 @@
+ "", // Dansk
+ "", // Èesky (Czech)
+ },
++ { "Tuner",
++ "Tuner",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "",
++ "", // Hrvatski (Croatian)
++ "", // Eesti
++ "", // Dansk
++ "", // Èesky (Czech)
++ },
+ { "Scanning on transponder",
+ "Durchsuche Transponder",
+ "",
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -128,9 +128,11 @@ cMenuChannelscan::cMenuChannelscan(int C
+ sBwItem[1] = "7 MHz";
+ sBwItem[2] = "8 MHz";
+
++ /*
+ sSRScanMode[0]= tr("Intelligent 6900/6875/6111");
+ sSRScanMode[1]= tr("Try all 6900/6875/6111");
+ sSRScanMode[2]= tr("Manual");
++ */
+
+ srScanMode=0;
+
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/series b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
index 0758e7ac501a..9039c46d25cf 100644
--- a/media-plugins/vdr-reelchannelscan/files/0.4.3/series
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
@@ -1 +1,4 @@
+default-source-if-no-channel-set.diff
+device-numbering.diff
+i18n.diff
gentoo.diff
diff --git a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1 b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r2
index eef97dc65401..eef97dc65401 100644
--- a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1
+++ b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r2
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
index c0bb31517739..e6599be7bb4b 100644
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild
+++ b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild,v 1.1 2007/05/21 10:12:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild,v 1.1 2007/05/21 11:51:20 zzam Exp $
inherit vdr-plugin
@@ -27,6 +27,9 @@ pkg_setup(){
src_unpack() {
vdr-plugin_src_unpack
+ epatch "${FILESDIR}/${PV}/default-source-if-no-channel-set.diff"
+ epatch "${FILESDIR}/${PV}/device-numbering.diff"
+ epatch "${FILESDIR}/${PV}/i18n.diff"
epatch "${FILESDIR}/${PV}/gentoo.diff"
fix_vdr_libsi_include filter.[ch]