diff options
author | 2013-09-15 13:46:56 +0000 | |
---|---|---|
committer | 2013-09-15 13:46:56 +0000 | |
commit | c65846c16678b597d8652c04142aceb8d4c2dac5 (patch) | |
tree | f94145b698d66254455aac087f404d746aacd285 /media-plugins | |
parent | version bump, fix bug #483946; Drop old. (diff) | |
download | gentoo-2-c65846c16678b597d8652c04142aceb8d4c2dac5.tar.gz gentoo-2-c65846c16678b597d8652c04142aceb8d4c2dac5.tar.bz2 gentoo-2-c65846c16678b597d8652c04142aceb8d4c2dac5.zip |
media-plugins/vdr-channelscan removal (pending 2013/07/23), see #474480 for reference.
Diffstat (limited to 'media-plugins')
10 files changed, 0 insertions, 350 deletions
diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog deleted file mode 100644 index aef906114eef..000000000000 --- a/media-plugins/vdr-channelscan/ChangeLog +++ /dev/null @@ -1,67 +0,0 @@ -# ChangeLog for media-plugins/vdr-channelscan -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.13 2011/01/28 18:07:07 hd_brummy Exp $ - - 28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org> - vdr-channelscan-0.1.0.ebuild: - eapi=3 - - 23 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org> - vdr-channelscan-0.1.0.ebuild: - eapi=2; keyword ~amd64 - - 06 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> - +files/vdr-channelscan-0.1.0-vdr-1.7.x.diff, - +files/vdr-channelscan-0.1.0_gcc-4.3.x.diff, vdr-channelscan-0.1.0.ebuild: - fixed compile probs gcc-4.3.x #bug 251186, thanks to Diego E. Petteno; - added compile fix for vdr-1.7.x - - 23 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-channelscan-0.1.0-vdr-1.5.10.diff, - vdr-channelscan-0.1.0.ebuild: - Added vdr-1.5.10 patch from e-tobi. - - 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml: - Assigned to Gentoo VDR Project. - - 09 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-channelscan-0.1.0-gcc4.diff, vdr-channelscan-0.1.0.ebuild: - Added gcc4-compatibility patch. - -*vdr-channelscan-0.1.0 (23 Jun 2006) - - 23 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-channelscan-0.1.0-shared-data.diff, - +files/vdr-channelscan-0.1.0-show-only-basename.diff, - +vdr-channelscan-0.1.0.ebuild, -vdr-channelscan-0.2.0.ebuild: - Switched ebuild vdr-channelscan to original-version of kikko77. - reelchannelscan has moved to its own ebuild vdr-reelchannelscan. - - 02 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> - -vdr-channelscan-0.3.0.ebuild: - moved to vdr-reelchannelscan-0.3.0 - -*vdr-channelscan-0.3.0 (01 May 2006) - - 01 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> metadata.xml, - +vdr-channelscan-0.3.0.ebuild: - version bump; add myself as 2nd maintainer - - 17 Apr 2006; Matthias Schwarzott <zzam@gentoo.org> - vdr-channelscan-0.2.0.ebuild: - Marked stable on x86 - - 14 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> - files/digest-vdr-channelscan-0.2.0, Manifest: - corrected wrong digest-file - - 13 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> - vdr-channelscan-0.2.0.ebuild: - Added transponderlist to upstream - -*vdr-channelscan-0.2.0 (13 Mar 2006) - - 13 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> +metadata.xml, - +vdr-channelscan-0.2.0.ebuild: - Initial import of ebuild written by me. - diff --git a/media-plugins/vdr-channelscan/Manifest b/media-plugins/vdr-channelscan/Manifest deleted file mode 100644 index d9f9b30e94f7..000000000000 --- a/media-plugins/vdr-channelscan/Manifest +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX vdr-channelscan-0.1.0-gcc4.diff 545 RMD160 9d6cb85b5c6014243ad043927c87237cf18845e4 SHA1 3a214bcd889e83d25d84045d1cfc298f49951030 SHA256 77eef7eb4de93952da460ec334a46eb9886c3fb0d7769bb853ec5fd37c04b95d -AUX vdr-channelscan-0.1.0-shared-data.diff 3922 RMD160 e8889c7daf399bf60b1184d5a9cdb98c1d06182a SHA1 240667219b58098012ab3cbb25da7a78ae0a30b7 SHA256 0f2e4c6198d19d3c3191ae68c381a86cc362de418d74a66b91d60246e0ffa21e -AUX vdr-channelscan-0.1.0-show-only-basename.diff 881 RMD160 6f1c7e4477fd324bf50b0c55b11d341b2f65e325 SHA1 a4600681503ecbb932fa4e7bcfe76853e560750d SHA256 7ec4e190a25f9f31b98dea8f06056d44698d7a8f8e519e0af02918159dd0a454 -AUX vdr-channelscan-0.1.0-vdr-1.5.10.diff 1440 RMD160 5bbce45dfd0dda8847af066251aa78016d027fc4 SHA1 7d2872a32affe2f0fdde6cfedcf5b0afaaea130c SHA256 1e1966cc014339abcfb45e2a2a0daa858d10d641d6ce28347ec136a611b38a52 -AUX vdr-channelscan-0.1.0-vdr-1.7.x.diff 751 RMD160 4e6738d64384f50c1e780ea24ae964cc474c3206 SHA1 68b7a33404ae46ba3c9ee3ad82afff6fea4cbfdf SHA256 6e17c8de8fdb5f5ac5fde263fbfb880df8b50a506cd34384f2d1f4a94f085a6f -AUX vdr-channelscan-0.1.0_gcc-4.3.x.diff 496 RMD160 b20132c8d4a3c713d71b8dafb23998250b04c3fa SHA1 ae443d48e008e4a964ba9a3cad9160c78646b815 SHA256 a532daee19f9e63c929059196e98709a373ab86548d002242f73004512306fa9 -DIST vdr-channelscan-0.1.0.tgz 48928 RMD160 d5dabd8aa7b82ace69be5e72ed9e914b0987b7fd SHA1 f6b5f34f671200cc3f4571166375cc5f26e3b5f7 SHA256 13b9398e2c9d449cf6f8a3c7c07416d0ecae7b2e6f5102978b341d3db5b1a0ab -EBUILD vdr-channelscan-0.1.0.ebuild 1121 RMD160 0c93a7822cf93eb1d97a0c71abc050e4b90f1f70 SHA1 6004539d9571f0c749f450ecf413d27d6e1cc99b SHA256 53a30e757305b68ee4d847d73b6aa82bcd92d3a6beaf4e5919aa21b834e6414a -MISC ChangeLog 2417 RMD160 c151d2e19da38b0af60b82b7a84649807ab2c79d SHA1 581da49e8e2d14d4136eb45b623762d46a20d7af SHA256 bc582c3afb611ddb89a71428ffe43040c16b1a6e0db7e0b8eb3518b62975ad93 -MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) -Comment: added by hd_brummy@gentoo.org - -iD8DBQFNQwXsdn07HTTCgIoRAhCiAKCtmqom2+MSkuzxgVEqvfanJXG3ggCbBA7V -PmBCQ7urnqPA9x/urF6fAD8= -=/zDc ------END PGP SIGNATURE----- diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff deleted file mode 100644 index a2bd29d8e988..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru channelscan-0.1.0-orig/channelscan.c channelscan-0.1.0/channelscan.c ---- channelscan-0.1.0-orig/channelscan.c 2006-08-09 15:43:41.658270206 +0200 -+++ channelscan-0.1.0/channelscan.c 2006-08-09 15:43:55.115608737 +0200 -@@ -86,7 +86,7 @@ - unsigned int &UNCChip ); - bool Signal(int Frequenz, char *Pol, int Symbolrate); - void LoadSatFile(int iPosition); -- void cMainMenu::ShowSatData(const char cSelectedFile[100]); -+ void ShowSatData(const char cSelectedFile[100]); - }; - - cMainMenu::cMainMenu(void) { diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-shared-data.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-shared-data.diff deleted file mode 100644 index 82c11b18037e..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-shared-data.diff +++ /dev/null @@ -1,110 +0,0 @@ -diff -ru channelscan-0.1.0-orig/channelscan.c channelscan-0.1.0/channelscan.c ---- channelscan-0.1.0-orig/channelscan.c 2006-06-23 11:26:35.517757751 +0200 -+++ channelscan-0.1.0/channelscan.c 2006-06-23 11:32:10.725870276 +0200 -@@ -86,7 +86,7 @@ - unsigned int &UNCChip ); - bool Signal(int Frequenz, char *Pol, int Symbolrate); - void LoadSatFile(int iPosition); -- void cMainMenu::ShowSatData(char cSelectedFile[100]); -+ void cMainMenu::ShowSatData(const char cSelectedFile[100]); - }; - - cMainMenu::cMainMenu(void) { -@@ -105,11 +105,7 @@ - osd=NULL; - // Now search a sat files - //LoadSatFile(1); -- const char *ConfDir = cPlugin::ConfigDirectory(); -- char cTranspoderDir[255]; -- strcpy(cTranspoderDir,ConfDir); -- strcat(cTranspoderDir,"//transponders//0130.ini"); -- strcpy(cSelectedFile, cTranspoderDir); -+ strcpy(cSelectedFile, "/usr/share/vdr/channelscan-transponders/0030.ini"); - iSelectedFile=0; - ShowSatData(cSelectedFile); - PFilter=NULL; -@@ -245,10 +241,7 @@ - - void cMainMenu::LoadSatFile(int iPosition) { - // Find the conf dir -- const char *ConfDir = cPlugin::ConfigDirectory(); -- char cTranspoderDir[255]; -- strcpy(cTranspoderDir,ConfDir); -- strcat(cTranspoderDir,"//transponders//"); -+ const char *cTranspoderDir = "/usr/share/vdr/channelscan-transponders/"; - cTranspoders oTransp; - oTransp.LoadArrTranspoders(cTranspoderDir); - // 20050920 -@@ -261,7 +254,7 @@ - } - } - --void cMainMenu::ShowSatData(char cSelectedFile[100]) { -+void cMainMenu::ShowSatData(const char cSelectedFile[100]) { - cTranspoders oTransp; - oTransp.GetTranspodersData(cSelectedFile); - iTotalTranspoders=oTransp.iCount; -diff -ru channelscan-0.1.0-orig/transponders.c channelscan-0.1.0/transponders.c ---- channelscan-0.1.0-orig/transponders.c 2006-06-23 11:26:35.521758134 +0200 -+++ channelscan-0.1.0/transponders.c 2006-06-23 11:35:03.874428429 +0200 -@@ -93,7 +93,7 @@ - return atoi(cTemp); - } - --string cTranspoders::ReadIni(char cFile[100], string sCategory, string sField) { -+string cTranspoders::ReadIni(const char cFile[100], string sCategory, string sField) { - string sReturn=""; - char cTemp; - string sInput=""; -@@ -141,7 +141,7 @@ - } - } - --void cTranspoders::GetTranspodersData(char cFile[100]) { -+void cTranspoders::GetTranspodersData(const char cFile[100]) { - string sField = ""; - string sTemp = ""; - // Reset the class structure -@@ -177,7 +177,7 @@ - } - - --int cTranspoders::openDir (char * path, char * cFilter) { -+int cTranspoders::openDir (const char * path, char * cFilter) { - DIR *dir=opendir(path); - struct dirent *sDir; - int iArrCount=0; -@@ -208,7 +208,7 @@ - return 0; - } - --void cTranspoders::LoadArrTranspoders(char * cPath) { -+void cTranspoders::LoadArrTranspoders(const char * cPath) { - openDir(cPath, "*.ini"); - for (int ii=0; ii<iArrTranspodersFile; ii++) { - for (int i=0; i<iArrTranspodersFile; i++) { -diff -ru channelscan-0.1.0-orig/transponders.h channelscan-0.1.0/transponders.h ---- channelscan-0.1.0-orig/transponders.h 2006-06-23 11:26:35.521758134 +0200 -+++ channelscan-0.1.0/transponders.h 2006-06-23 11:35:11.979201835 +0200 -@@ -24,17 +24,17 @@ - int iArrTranspodersFile; - string sArrTranspodersFile[1000]; - // Method -- string ReadIni(char cFile[1000], string sCategory, string sField); -+ string ReadIni(const char cFile[1000], string sCategory, string sField); - string IntToStr(int iValue); - string StrAfterChar(string sLine, char cFind); - string StrBeforeChar(string sLine, char cFind); - string StrTrim(string sInput); - string CharToStr(char *cInput); - int StrToInt(string sInput); -- void GetTranspodersData(char cFile[1000]); -+ void GetTranspodersData(const char cFile[1000]); - void Reset(void); -- int openDir (char * path, char * cFilter); -- void LoadArrTranspoders(char * cPath); -+ int openDir (const char * path, char * cFilter); -+ void LoadArrTranspoders(const char * cPath); - }; - - #endif //_TRANSPODERS__H diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-show-only-basename.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-show-only-basename.diff deleted file mode 100644 index 9c77d89268c3..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-show-only-basename.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru channelscan-0.1.0-orig/channelscan.c channelscan-0.1.0/channelscan.c ---- channelscan-0.1.0-orig/channelscan.c 2006-06-23 11:44:55.058954108 +0200 -+++ channelscan-0.1.0/channelscan.c 2006-06-23 11:49:54.563646537 +0200 -@@ -399,15 +399,10 @@ - // Sat file - sprintf(cTemp, tr("Current file:")); - osd->DrawText(10,iTop+30,cTemp,clrWhite,clrBackwindow,cFont::GetFont(fontOsd)); -- int a=0; -- for (int i=0; i<100; i++) { -- if ((cSelectedFile[i] == '/') && (cSelectedFile[i+1] == '/')) { -- i++; -- } -- cTemp[a] = cSelectedFile[i]; -- cTemp[a+1] = '\0'; -- a++; -- } -+ int basename_start=strlen(cSelectedFile); -+ while (basename_start > 0 && cSelectedFile[basename_start-1] != '/') -+ basename_start--; -+ sprintf(cTemp, "%s", cSelectedFile + basename_start); - osd->DrawText(150,iTop+30,cTemp,clrWhite,clrBackwindow,cFont::GetFont(fontOsd)); - - iTop = 120; diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff deleted file mode 100644 index 49113bc429ec..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_channelscan-0.1.0-1.5.10.dpatch by yolgecen at vdrportal.de -## http://vdrportal.de/board/thread.php?threadid=69815 -## -## Thomas Günther <tom@toms-cafe.de>: -## - Added compatibility to VDR < 1.5.10 -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes for VDR >= 1.5.10. - -@DPATCH@ -diff -ur channelscan-0.1.0/filter.c channelscan-0.1.0_vdr-1.5.10/filter.c ---- channelscan-0.1.0/filter.c 2005-09-20 19:21:25.000000000 +0200 -+++ channelscan-0.1.0_vdr-1.5.10/filter.c 2007-10-15 23:43:08.000000000 +0200 -@@ -372,6 +372,10 @@ - int Dpids[MAXDPIDS + 1] = { 0 }; - char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; - char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; -+#if VDRVERSNUM >= 10510 -+ int Spids[MAXDPIDS + 1] = { 0 }; -+ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; -+#endif - int Tpid = 0; - int NumApids = 0; - int NumDpids = 0; -@@ -445,7 +449,11 @@ - delete d; - } - } -+#if VDRVERSNUM >= 10510 -+ Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); -+#else - Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid); -+#endif - Channel->SetCaIds(CaDescriptors->CaIds()); - Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors)); - } diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff deleted file mode 100644 index b98784f00985..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur channelscan-0.1.0.orig/channelscan.c channelscan-0.1.0/channelscan.c ---- channelscan-0.1.0.orig/channelscan.c 2009-01-06 20:46:26.000000000 +0100 -+++ channelscan-0.1.0/channelscan.c 2009-01-06 20:48:32.000000000 +0100 -@@ -170,7 +170,7 @@ - Pol = &cTemp; - Symbolrate = oTransp.iSymbolrate[i]; - *SChannel=*OldChannel; -- SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO); -+ SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO,0,0,0); - cDevice::GetDevice(cardnr)->SwitchChannel(SChannel,HasSwitched); - PFilter = new PatFilter(); - SFilter = new SdtFilter(PFilter); diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff deleted file mode 100644 index bda2f179f9bb..000000000000 --- a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff +++ /dev/null @@ -1,15 +0,0 @@ -missing includes for gcc-4.3.x -https://bugs.gentoo.org/show_bug.cgi?id=251186 -diff -Naur channelscan-0.1.0.orig/transponders.h channelscan-0.1.0/transponders.h ---- channelscan-0.1.0.orig/transponders.h 2009-01-06 20:40:37.000000000 +0100 -+++ channelscan-0.1.0/transponders.h 2009-01-06 20:41:10.000000000 +0100 -@@ -7,7 +7,8 @@ - #include <iostream> - #include <fstream> - #include <dirent.h> --#include <string> -+#include <string.h> -+#include <stdlib.h> - - using std::string; - using std::ifstream; diff --git a/media-plugins/vdr-channelscan/metadata.xml b/media-plugins/vdr-channelscan/metadata.xml deleted file mode 100644 index 64b0e6804cde..000000000000 --- a/media-plugins/vdr-channelscan/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>media-tv</herd> - <maintainer> - <email>vdr@gentoo.org</email> - <name>Gentoo VDR Project</name> - </maintainer> -<longdescription lang="en"> -</longdescription> -</pkgmetadata> - diff --git a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild deleted file mode 100644 index cb60f4a3eb3e..000000000000 --- a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.7 2011/01/28 18:07:07 hd_brummy Exp $ - -EAPI="3" - -inherit vdr-plugin - -DESCRIPTION="VDR plugin: scan for channels on DVB-S" -HOMEPAGE="http://kikko77.altervista.org/" -SRC_URI="http://kikko77.altervista.org/sections/Download/[10]_channelscan/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" - -DEPEND=">=media-video/vdr-1.3.18" -RDEPEND="${DEPEND}" - -# access transponder-data under /usr/share/vdr/channelscan-transponders -PATCHES=("${FILESDIR}/${P}-shared-data.diff" - "${FILESDIR}/${P}-show-only-basename.diff" - "${FILESDIR}/${P}-gcc4.diff" - "${FILESDIR}/${P}-vdr-1.5.10.diff" - "${FILESDIR}/${P}_gcc-4.3.x.diff") - -src_prepare() { - vdr-plugin_src_prepare - fix_vdr_libsi_include filter.c - - has_version ">=media-video/vdr-1.7.0" && \ - epatch "${FILESDIR}/${P}-vdr-1.7.x.diff" -} - -src_install() { - vdr-plugin_src_install - - insinto /usr/share/vdr/channelscan-transponders - doins "${S}"/transponders/*.ini -} |