diff options
Diffstat (limited to 'media-plugins/vdr-channelscan')
5 files changed, 181 insertions, 1 deletions
diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog index 22e2ac8802d1..5ec2ceb2df5d 100644 --- a/media-plugins/vdr-channelscan/ChangeLog +++ b/media-plugins/vdr-channelscan/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-plugins/vdr-channelscan # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.6 2006/05/02 20:47:55 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.7 2006/06/23 10:30:58 zzam Exp $ + +*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: diff --git a/media-plugins/vdr-channelscan/files/digest-vdr-channelscan-0.1.0 b/media-plugins/vdr-channelscan/files/digest-vdr-channelscan-0.1.0 new file mode 100644 index 000000000000..91c086122fe6 --- /dev/null +++ b/media-plugins/vdr-channelscan/files/digest-vdr-channelscan-0.1.0 @@ -0,0 +1,3 @@ +MD5 dad171f25a2b3776aadb5e83ad209429 vdr-channelscan-0.1.0.tgz 48928 +RMD160 d5dabd8aa7b82ace69be5e72ed9e914b0987b7fd vdr-channelscan-0.1.0.tgz 48928 +SHA256 13b9398e2c9d449cf6f8a3c7c07416d0ecae7b2e6f5102978b341d3db5b1a0ab vdr-channelscan-0.1.0.tgz 48928 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 new file mode 100644 index 000000000000..82c11b18037e --- /dev/null +++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-shared-data.diff @@ -0,0 +1,110 @@ +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 new file mode 100644 index 000000000000..9c77d89268c3 --- /dev/null +++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-show-only-basename.diff @@ -0,0 +1,23 @@ +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/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild new file mode 100644 index 000000000000..b4397416bc13 --- /dev/null +++ b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2006 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.1 2006/06/23 10:30:58 zzam Exp $ + +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" +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" + +src_unpack() { + vdr-plugin_src_unpack + fix_vdr_libsi_include filter.c +} + +src_install() { + vdr-plugin_src_install + + insinto /usr/share/vdr/channelscan-transponders + doins ${S}/transponders/*.ini +} + |