fixed bug 203865, thanks to L.Muresan; cleanup

(Portage version: 2.1.3.19)

19 files changed, 73 insertions, 1519 deletions

diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog
index 48347d157774..76f7e2456f7f 100644
--- a/media-plugins/vdr-graphlcd/ChangeLog
+++ b/media-plugins/vdr-graphlcd/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for media-plugins/vdr-graphlcd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.18 2007/06/26 19:54:28 hd_brummy Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.19 2008/01/01 12:04:41 hd_brummy Exp $
+
+*vdr-graphlcd-0.1.5-r1 (01 Jan 2008)
+
+  01 Jan 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.1.3/radiotext-lcr-service.diff,
+  -files/vdr-graphlcd-0.1.3-uint64.diff,
+  -files/0.1.4/graphlcd-0.1.4-better-readable-on-medium-displays.diff,
+  -files/0.1.2/radiotext-lcr-service.diff,
+  -files/0.1.3/graphlcd-0.1.3-span.diff,
+  -files/0.1.4/vdr-graphlcd-0.1.4-missing-include.patch,
+  -files/0.1.4/graphlcd-0.1.4-radiotext-lcr-service.diff,
+  -files/0.1.4/graphlcd-0.1.4-span.diff,
+  +files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff,
+  -vdr-graphlcd-0.1.2_pre6-r1.ebuild, -vdr-graphlcd-0.1.3.ebuild,
+  -vdr-graphlcd-0.1.3-r1.ebuild, -vdr-graphlcd-0.1.4.ebuild,
+  +vdr-graphlcd-0.1.5-r1.ebuild:
+  fixed bug 203865, thanks to L.Muresan; cleanup
 
   26 Jun 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff, vdr-graphlcd-0.1.5.ebuild:
diff --git a/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff
deleted file mode 100644
index ef9737dfef9d..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff
+++ /dev/null
@@ -1,124 +0,0 @@
---- state.h.orig	2005-05-07 11:23:42.000000000 +0200
-+++ state.h	2006-02-13 17:23:23.000000000 +0100
-@@ -120,4 +120,22 @@
- 	tVolumeState GetVolumeState();
- };
- 
-+// Radiotext
-+struct RadioTextService_v1_0 {
-+  int rds_info;
-+  int rds_pty;
-+  char *rds_text;
-+  char *rds_title;
-+  char *rds_artist;
-+  struct tm *title_start;
-+};
-+
-+// LcrData
-+struct LcrService_v1_0 {
-+  cString destination;
-+  cString price;
-+  cString pulse;
-+};
-+
- #endif
-+
-
---- state.c.orig	2005-05-07 11:23:42.000000000 +0200
-+++ state.c	2006-02-28 17:28:31.000000000 +0100
-@@ -15,6 +15,7 @@
- #include "strfct.h"
- 
- #include <vdr/i18n.h>
-+#include <vdr/plugin.h>
- 
- #include "compat.h"
- 
-@@ -568,6 +569,8 @@
- 
- void cGraphLCDState::GetProgramme()
- {
-+    bool ptitle = false;
-+
- 	mutex.Lock();
- #if VDRVERSNUM < 10300
- 	const cEventInfo * present = NULL, * following = NULL;
-@@ -584,8 +587,10 @@
- 				{
- 					event.presentTime = present->GetTime();
- 					event.presentTitle = "";
--					if (!isempty(present->GetTitle()))
-+					if (!isempty(present->GetTitle())) {
- 						event.presentTitle = present->GetTitle();
-+						ptitle = true;
-+						}
- 					event.presentSubtitle = "";
- 					if (!isempty(present->GetSubtitle()))
- 						event.presentSubtitle = present->GetSubtitle();
-@@ -618,8 +623,10 @@
- 				{
- 					event.presentTime = present->StartTime();
- 					event.presentTitle = "";
--					if (!isempty(present->Title()))
-+					if (!isempty(present->Title())) {
- 						event.presentTitle = present->Title();
-+						ptitle = true;
-+						}
- 					event.presentSubtitle = "";
- 					if (!isempty(present->ShortText()))
- 						event.presentSubtitle = present->ShortText();
-@@ -638,6 +645,54 @@
- 		}
- 	}
- #endif
-+
-+#if VDRVERSNUM >= 10330
-+	{ // get&display Radiotext
-+		cPlugin *p;
-+		p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL);
-+		if (p) {
-+			RadioTextService_v1_0 rtext;
-+			if (cPluginManager::CallFirstService("RadioTextService-v1.0", &rtext)) {
-+				if (rtext.rds_info == 2 && strstr(rtext.rds_title, "---") == NULL) {
-+					char rtpinfo[2][65], rtstr[140];
-+					strcpy(rtpinfo[0], rtext.rds_title);
-+					strcpy(rtpinfo[1], rtext.rds_artist);
-+					sprintf(rtstr, "%02d:%02d  %s | %s", rtext.title_start->tm_hour, rtext.title_start->tm_min, trimright(rtpinfo[0]), trimright(rtpinfo[1]));
-+				        ptitle ? event.presentSubtitle = rtstr : event.presentTitle = rtstr;
-+				}
-+				else if (rtext.rds_info > 0) {
-+					char rtstr[65];
-+					strcpy(rtstr, rtext.rds_text);
-+					ptitle ? event.presentSubtitle = trimright(rtstr) : event.presentTitle = trimright(rtstr);
-+				}
-+			}
-+		}
-+	}
-+#endif
-+
-+#if VDRVERSNUM >= 10330
-+	{ // get&display LcrData
-+		cPlugin *p;
-+		p = cPluginManager::CallFirstService("LcrService-v1.0", NULL);
-+		if (p)
-+		{
-+			LcrService_v1_0 lcrData;
-+			if (cPluginManager::CallFirstService("LcrService-v1.0", &lcrData))
-+			{
-+				if ( strstr( lcrData.destination, "---" ) == NULL )
-+				{
-+					char lcrStringParts[3][25], lcrString[100];
-+					strcpy( lcrStringParts[0], (const char *)lcrData.destination );
-+					strcpy( lcrStringParts[1], (const char *)lcrData.price );
-+					strcpy( lcrStringParts[2], (const char *)lcrData.pulse );
-+					sprintf(lcrString, "%s | %s", trimright(lcrStringParts[1]), trimright(lcrStringParts[2]));
-+					event.presentTitle = trimright(lcrStringParts[0]);
-+					event.presentSubtitle = trimright(lcrString);
-+				}
-+			}
-+		}
-+	}
-+#endif
- 	mutex.Unlock();
- }
- 
diff --git a/media-plugins/vdr-graphlcd/files/0.1.3/graphlcd-0.1.3-span.diff b/media-plugins/vdr-graphlcd/files/0.1.3/graphlcd-0.1.3-span.diff
deleted file mode 100644
index 7ce37e340ba0..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.3/graphlcd-0.1.3-span.diff
+++ /dev/null
@@ -1,416 +0,0 @@
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/display.c graphlcd-0.1.3/display.c
---- graphlcd-0.1.3.old/display.c	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/display.c	2006-09-07 13:04:51.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #include <vdr/tools.h>
- #include <vdr/menu.h>
-+#include <vdr/plugin.h>
- 
- #include "compat.h"
- 
-@@ -108,6 +109,8 @@
- 	nCurrentBrightness = -1;
- 	LastTimeBrightness = 0;
- 	bBrightnessActive = true;
-+	
-+	LastTimeSA.Set(0);
- }
- 
- cGraphLCDDisplay::~cGraphLCDDisplay()
-@@ -374,15 +377,22 @@
- 							{
- 								update = true;
- 							}
--
-+							
-+							if ( LastTimeSA.TimedOut() )
-+							{
-+								update = true;
-+								LastTimeSA.Set(1000);
-+							}
-+							
- 							// update Display every second or due to an update
--							if (CurrTime != LastTime || update)
-+							if (CurrTime != LastTime || update )
- 							{
- 								// but only, if something has changed
- 								if (replay.total / FRAMESPERSEC != replay.totalLast / FRAMESPERSEC ||
- 									replay.current / FRAMESPERSEC != replay.currentLast / FRAMESPERSEC ||
- 									CurrTime/60 != LastTime/60 ||
--									update)
-+									update
-+									)
- 								{
- 									timerclear(&UpdateAt);
- 									update = false;
-@@ -1439,7 +1449,7 @@
- 			it->Draw(bitmap);
- 		}
- 	}
--
-+	
- 	// Draw Progressbar with current and total replay time
- 	nTopY = bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2;
- 	nMaxX = std::max(1, bitmap->Width() - 1 - 2 * FRAME_SPACE_X);
-@@ -1456,6 +1466,8 @@
- 			FRAME_SPACE_X + nMaxX,
- 			nTopY + nProgressbarHeight,
- 			GLCD::clrBlack, false);
-+	
-+	DisplaySA();
- 
- 	if (1 < replay.total && 1 < replay.current) // Don't show full progressbar for endless streams 
- 	{
-@@ -2023,4 +2035,140 @@
- 	mutex.Unlock();
- }
- 
-+void cGraphLCDDisplay::DisplaySA()
-+{
-+// Spectrum Analyzer visualization
-+	if ( GraphLCDSetup.enableSpectrumAnalyzer )
-+	{
-+		if (cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, NULL))
-+		{
-+			Span_GetBarHeights_v1_0 GetBarHeights;
-+			
-+			int bandsSA = 20;
-+			int falloffSA = 8;
-+			int channelsSA = 1;
-+			
-+			unsigned int bar;
-+			unsigned int *barHeights = new unsigned int[bandsSA];
-+			unsigned int *barHeightsLeftChannel = new unsigned int[bandsSA];
-+			unsigned int *barHeightsRightChannel = new unsigned int[bandsSA];
-+			unsigned int volumeLeftChannel;
-+			unsigned int volumeRightChannel;
-+			unsigned int volumeBothChannels;
-+			unsigned int *barPeaksBothChannels = new unsigned int[bandsSA];
-+			unsigned int *barPeaksLeftChannel = new unsigned int[bandsSA];
-+			unsigned int *barPeaksRightChannel = new unsigned int[bandsSA];
-+							
-+			GetBarHeights.bands 					= bandsSA;
-+			GetBarHeights.barHeights				= barHeights;
-+			GetBarHeights.barHeightsLeftChannel 	= barHeightsLeftChannel;
-+			GetBarHeights.barHeightsRightChannel	= barHeightsRightChannel;
-+			GetBarHeights.volumeLeftChannel			= &volumeLeftChannel;
-+			GetBarHeights.volumeRightChannel		= &volumeRightChannel;
-+			GetBarHeights.volumeBothChannels		= &volumeBothChannels;
-+			GetBarHeights.name						= "graphlcd";
-+			GetBarHeights.falloff					= falloffSA;
-+			GetBarHeights.barPeaksBothChannels		= barPeaksBothChannels;
-+			GetBarHeights.barPeaksLeftChannel		= barPeaksLeftChannel;
-+			GetBarHeights.barPeaksRightChannel		= barPeaksRightChannel;
-+			
-+			if ( cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, &GetBarHeights ))
-+			{
-+				int i;
-+				int barWidth = 2;
-+				int saStartX = FRAME_SPACE_X;
-+				int saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1;
-+				int saStartY = FRAME_SPACE_Y;
-+				int saEndY = FRAME_SPACE_Y + bitmap->Height()/2 - 3;
-+				
-+				LastTimeSA.Set(100);
-+				
-+				if ( GraphLCDSetup.SAShowVolume )
-+				{
-+					
-+					saStartX = FRAME_SPACE_X  + bitmap->Width()/2 - (barWidth*bandsSA*2 + bandsSA/4)/2 - 2;
-+					saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1;
-+					
-+					// left volume
-+					bitmap->DrawRectangle(FRAME_SPACE_X,
-+						saStartY,
-+						saStartX-1,
-+						saEndY + 1,
-+						GLCD::clrWhite, true);
-+					
-+					for ( i=0; (i<logo->Width()/2-2) && (i<3*(volumeLeftChannel*saStartX)/100); i++)
-+					{
-+						bitmap->DrawRectangle(saStartX - i - 2,
-+							saStartY + saEndY/2 - i,
-+							saStartX - i - 4,
-+							saStartY + saEndY/2 + i,
-+							GLCD::clrBlack, true);
-+					}
-+					
-+					// right volume
-+					bitmap->DrawRectangle(saEndX + 1,
-+						saStartY,
-+						bitmap->Width() - 1,
-+						saEndY + 1,
-+						GLCD::clrWhite, true);
-+					
-+					for ( i=0; (i<logo->Width()/2-2) && (i<3*(volumeRightChannel*saStartX)/100); i++)
-+					{
-+						bitmap->DrawRectangle(saEndX + 2 + i,
-+							saStartY + saEndY/2 - i,
-+							saEndX + i + 4,
-+							saStartY + saEndY/2 + i,
-+							GLCD::clrBlack, true);
-+					}
-+				}
-+				// black background
-+				bitmap->DrawRectangle(saStartX,
-+					saStartY,
-+					saEndX,
-+					saEndY + 1,
-+					GLCD::clrBlack, true);
-+
-+				for ( i=0; i < bandsSA; i++ )
-+				{
-+/*					if ( channelsSA == 2 )
-+					{
-+						bar = barHeightsLeftChannel[i];
-+						bar = barHeightsRightChannel[i];
-+					}*/
-+					if ( channelsSA == 1)
-+					{
-+						// the bar
-+						bar = (barHeights[i]*(saEndY-saStartY))/100;
-+						bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1,
-+							saEndY,
-+							saStartX + barWidth*2*(i) + barWidth+ barWidth + 1,
-+							saEndY - bar,
-+							GLCD::clrWhite, true);
-+						
-+						// the peak
-+						bar = (barPeaksBothChannels[i]*(saEndY-saStartY))/100;
-+						if ( bar > 0 )
-+						{
-+							bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1,
-+								saEndY - bar,
-+								saStartX + barWidth*2*(i) + barWidth+ barWidth + 1,
-+								saEndY - bar+1,
-+								GLCD::clrWhite, true);
-+						}
-+					}
-+				}
-+			}
-+			
-+			delete [] barHeights;
-+			delete [] barHeightsLeftChannel;
-+			delete [] barHeightsRightChannel;
-+			delete [] barPeaksBothChannels;
-+			delete [] barPeaksLeftChannel;
-+			delete [] barPeaksRightChannel;
-+		}
-+	}
-+}
-+	
-+//#############################################################################################
-+
- cGraphLCDDisplay Display;
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/display.h graphlcd-0.1.3/display.h
---- graphlcd-0.1.3.old/display.h	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/display.h	2006-09-07 11:08:35.000000000 +0200
-@@ -44,6 +44,45 @@
- #include <vdr/thread.h>
- #include <vdr/player.h>
- 
-+#define SPAN_PROVIDER_CHECK_ID 	"Span-ProviderCheck-v1.0"
-+#define SPAN_CLIENT_CHECK_ID 	"Span-ClientCheck-v1.0"
-+#define SPAN_SET_PCM_DATA_ID 	"Span-SetPcmData-v1.0"
-+#define SPAN_GET_BAR_HEIGHTS_ID "Span-GetBarHeights-v1.0"
-+
-+//Span requests to collect possible providers / clients
-+struct Span_Provider_Check_1_0 {
-+	bool *isActive;
-+	bool *isRunning;
-+};
-+
-+struct Span_Client_Check_1_0 {
-+	bool *isActive;
-+	bool *isRunning;
-+};
-+
-+// Span data
-+struct Span_SetPcmData_1_0 {
-+	unsigned int length;	// the length of the PCM-data
-+	int *data;				// the PCM-Data as 32-bit int, however only the lower 16-bit are used
-+							// and you have to take care to hand in such data!
-+};
-+
-+struct Span_GetBarHeights_v1_0 {
-+	unsigned int bands;						// number of bands to compute
-+	unsigned int *barHeights;				// the heights of the bars of the two channels combined
-+	unsigned int *barHeightsLeftChannel;	// the heights of the bars of the left channel
-+	unsigned int *barHeightsRightChannel;	// the heights of the bars of the right channel
-+	unsigned int *volumeLeftChannel;		// the volume of the left channels
-+	unsigned int *volumeRightChannel;		// the volume of the right channels
-+	unsigned int *volumeBothChannels;		// the combined volume of the two channels
-+	const char *name;						// name of the plugin that wants to get the data
-+											// (must be unique for each client!)
-+	unsigned int falloff;                   // bar falloff value
-+	unsigned int *barPeaksBothChannels;     // bar peaks of the two channels combined
-+	unsigned int *barPeaksLeftChannel;      // bar peaks of the left channel
-+	unsigned int *barPeaksRightChannel;     // bar peaks of the right channel
-+};
-+
- 
- #define LCDMAXCARDS 4
- static const int kMaxTabCount = 10;
-@@ -118,6 +157,7 @@
- 	time_t LastTime;
- 	time_t LastTimeCheckSym;
- 	time_t LastTimeModSym;
-+	cTimeMs LastTimeSA;
- 	struct timeval CurrTimeval;
- 	struct timeval UpdateAt;
- 
-@@ -139,6 +179,7 @@
- 	void DisplayTextItem();
- 	void DisplayColorButtons();
- 	void DisplayVolume();
-+	void DisplaySA();
- 
- 	void UpdateIn(long usec);
- 	bool CheckAndUpdateSymbols();
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/i18n.c graphlcd-0.1.3/i18n.c
---- graphlcd-0.1.3.old/i18n.c	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/i18n.c	2006-09-07 12:23:02.000000000 +0200
-@@ -966,5 +966,53 @@
- # endif
- #endif
- 	},
-+	{
-+		"Show spectrum analyzer",
-+		"Zeige Spectrum Analyzer",
-+		"",// TODO Slovenski
-+		"",// TODO Italiano
-+		"",// TODO Nederlands
-+		"",// TODO Português
-+		"",// TODO Français
-+		"",// TODO Norsk
-+		"",// TODO Suomi
-+		"",// TODO Polski
-+		"",// TODO Español
-+		"",// TODO Ellinika
-+		"",// TODO Svenska
-+		"",// TODO Românã
-+		"",// TODO Magyar
-+		"",// TODO Català
-+#if VDRVERSNUM > 10302
-+		"",// TODO Russian
-+# if VDRVERSNUM > 10307
-+		"",// TODO Croatian
-+# endif
-+#endif
-+	},
-+	{
-+		"Show SA volume",
-+		"Zeige SA Lautstärke",
-+		"",// TODO Slovenski
-+		"",// TODO Italiano
-+		"",// TODO Nederlands
-+		"",// TODO Português
-+		"",// TODO Français
-+		"",// TODO Norsk
-+		"",// TODO Suomi
-+		"",// TODO Polski
-+		"",// TODO Español
-+		"",// TODO Ellinika
-+		"",// TODO Svenska
-+		"",// TODO Românã
-+		"",// TODO Magyar
-+		"",// TODO Català
-+#if VDRVERSNUM > 10302
-+		"",// TODO Russian
-+# if VDRVERSNUM > 10307
-+		"",// TODO Croatian
-+# endif
-+#endif
-+	},
- 	{ NULL }
- };
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/menu.c graphlcd-0.1.3/menu.c
---- graphlcd-0.1.3.old/menu.c	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/menu.c	2006-09-07 12:21:58.000000000 +0200
-@@ -75,6 +75,8 @@
- 	Add(new cMenuEditIntItem(tr("Brightness on user activity"), &newGraphLCDSetup.BrightnessActive, 0, 100));
- 	Add(new cMenuEditIntItem(tr("Brightness on user inactivity"), &newGraphLCDSetup.BrightnessIdle, 0, 100));
- 	Add(new cMenuEditIntItem(tr("Brightness delay [s]"), &newGraphLCDSetup.BrightnessDelay, 0, 600));
-+	Add(new cMenuEditBoolItem(tr("Show spectrum analyzer"), &newGraphLCDSetup.enableSpectrumAnalyzer));
-+	Add(new cMenuEditBoolItem(tr("Show SA volume"), &newGraphLCDSetup.SAShowVolume));
- }
- 
- void cGraphLCDMenuSetup::Store()
-@@ -101,4 +103,6 @@
- 	SetupStore("BrightnessActive", GraphLCDSetup.BrightnessActive = newGraphLCDSetup.BrightnessActive);
- 	SetupStore("BrightnessIdle", GraphLCDSetup.BrightnessIdle = newGraphLCDSetup.BrightnessIdle);
- 	SetupStore("BrightnessDelay", GraphLCDSetup.BrightnessDelay = newGraphLCDSetup.BrightnessDelay);
-+	SetupStore("enableSpectrumAnalyzer", GraphLCDSetup.enableSpectrumAnalyzer = newGraphLCDSetup.enableSpectrumAnalyzer);
-+	SetupStore("SAShowVolume", GraphLCDSetup.SAShowVolume = newGraphLCDSetup.SAShowVolume);
- }
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/plugin.c graphlcd-0.1.3/plugin.c
---- graphlcd-0.1.3.old/plugin.c	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/plugin.c	2006-09-07 12:20:48.000000000 +0200
-@@ -67,6 +67,8 @@
- 	virtual cOsdObject * MainMenuAction();
- 	virtual cMenuSetupPage * SetupMenu();
- 	virtual bool SetupParse(const char * Name, const char * Value);
-+	
-+	virtual bool Service(const char *Id, void *Data);
- };
- 
- cPluginGraphLCD::cPluginGraphLCD()
-@@ -235,8 +237,24 @@
- 	else if (!strcasecmp(Name, "BrightnessActive")) GraphLCDSetup.BrightnessActive = atoi(Value);
- 	else if (!strcasecmp(Name, "BrightnessIdle")) GraphLCDSetup.BrightnessIdle = atoi(Value);
- 	else if (!strcasecmp(Name, "BrightnessDelay")) GraphLCDSetup.BrightnessDelay = atoi(Value);
-+	else if (!strcasecmp(Name, "enableSpectrumAnalyzer")) GraphLCDSetup.enableSpectrumAnalyzer = atoi(Value);
-+	else if (!strcasecmp(Name, "SAShowVolume")) GraphLCDSetup.SAShowVolume = atoi(Value);
- 	else return false;
- 	return true;
- }
- 
-+bool cPluginGraphLCD::Service(const char *Id, void *Data)
-+{
-+	if (strcmp(Id, SPAN_CLIENT_CHECK_ID) == 0)
-+	{
-+		if ( GraphLCDSetup.enableSpectrumAnalyzer && (Data != NULL) )
-+		{
-+			*((Span_Client_Check_1_0*)Data)->isActive = true;
-+		}
-+		return true;
-+	}
-+	
-+	return false;
-+}
-+
- VDRPLUGINCREATOR(cPluginGraphLCD); // Don't touch this!
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/setup.c graphlcd-0.1.3/setup.c
---- graphlcd-0.1.3.old/setup.c	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/setup.c	2006-09-07 12:19:22.000000000 +0200
-@@ -52,7 +52,9 @@
- 	ScrollTime(500),
- 	BrightnessActive(100),
- 	BrightnessIdle(100),
--	BrightnessDelay(30)
-+	BrightnessDelay(30),
-+	enableSpectrumAnalyzer(1),
-+	SAShowVolume(1)
- {
- }
- 
-@@ -90,4 +92,6 @@
- 	BrightnessActive = source->BrightnessActive;
- 	BrightnessIdle = source->BrightnessIdle;
- 	BrightnessDelay = source->BrightnessDelay;
-+	enableSpectrumAnalyzer = source->enableSpectrumAnalyzer;
-+	SAShowVolume = source->SAShowVolume;
- }
-diff -Naur --exclude='.*' graphlcd-0.1.3.old/setup.h graphlcd-0.1.3/setup.h
---- graphlcd-0.1.3.old/setup.h	2006-09-07 16:00:17.000000000 +0200
-+++ graphlcd-0.1.3/setup.h	2006-09-07 12:20:11.000000000 +0200
-@@ -54,6 +54,8 @@
- 	int BrightnessActive;
- 	int BrightnessIdle;
- 	int BrightnessDelay;
-+	int enableSpectrumAnalyzer;
-+	int SAShowVolume;
- 
- public:
- 	cGraphLCDSetup(void);
diff --git a/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff
deleted file mode 100644
index 1b5d1f9c3c38..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur graphlcd-0.1.3.orig/state.c graphlcd-0.1.3/state.c
---- graphlcd-0.1.3.orig/state.c	2006-01-15 18:25:47.000000000 +0100
-+++ graphlcd-0.1.3/state.c	2006-03-03 17:25:38.914590500 +0100
-@@ -16,6 +16,7 @@
- 
- #include <vdr/eitscan.h>
- #include <vdr/i18n.h>
-+#include <vdr/plugin.h>
- 
- #include "compat.h"
- 
-@@ -619,7 +620,10 @@
- void cGraphLCDState::SetChannel(int ChannelNumber)
- {
- 	char tmp[16];
--
-+// patch start (http://www.vdr-portal.de/board/thread.php?postid=415431#post415431)
-+   if (ChannelNumber == 0)
-+       return;
-+// patch end
- 	mutex.Lock();
- 
- 	channel.number = ChannelNumber;
-@@ -638,6 +642,8 @@
- 
- void cGraphLCDState::GetProgramme()
- {
-+    bool ptitle = false;
-+
- 	mutex.Lock();
- #if VDRVERSNUM < 10300
- 	const cEventInfo * present = NULL, * following = NULL;
-@@ -654,9 +660,11 @@
- 				{
- 					event.presentTime = present->GetTime();
- 					event.presentTitle = "";
--					if (!isempty(present->GetTitle()))
-+					if (!isempty(present->GetTitle())) {
- 						event.presentTitle = present->GetTitle();
- 					event.presentSubtitle = "";
-+					ptitle = true;
-+					}
- 					if (!isempty(present->GetSubtitle()))
- 						event.presentSubtitle = present->GetSubtitle();
- 				}
-@@ -688,9 +696,11 @@
- 				{
- 					event.presentTime = present->StartTime();
- 					event.presentTitle = "";
--					if (!isempty(present->Title()))
-+					if (!isempty(present->Title())) {
- 						event.presentTitle = present->Title();
- 					event.presentSubtitle = "";
-+					ptitle = true;
-+					}
- 					if (!isempty(present->ShortText()))
- 						event.presentSubtitle = present->ShortText();
- 				}
-@@ -708,6 +718,54 @@
- 		}
- 	}
- #endif
-+
-+#if VDRVERSNUM >= 10330
-+   { // get&display Radiotext
-+       cPlugin *p;
-+       p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL);
-+       if (p) {
-+           RadioTextService_v1_0 rtext;
-+           if (cPluginManager::CallFirstService("RadioTextService-v1.0", &rtext)) {
-+               if (rtext.rds_info == 2 && strstr(rtext.rds_title, "---") == NULL) {
-+                   char rtpinfo[2][65], rtstr[140];
-+                   strcpy(rtpinfo[0], rtext.rds_title);
-+                   strcpy(rtpinfo[1], rtext.rds_artist);
-+                   sprintf(rtstr, "%02d:%02d  %s | %s", rtext.title_start->tm_hour, rtext.title_start->tm_min, trimright(rtpinfo[0]), trimright(rtpinfo[1]));
-+                       ptitle ? event.presentSubtitle = rtstr : event.presentTitle = rtstr;
-+               }
-+               else if (rtext.rds_info > 0) {
-+                   char rtstr[65];
-+                   strcpy(rtstr, rtext.rds_text);
-+                   ptitle ? event.presentSubtitle = trimright(rtstr) : event.presentTitle = trimright(rtstr);
-+               }
-+           }
-+       }
-+   }
-+#endif
-+
-+#if VDRVERSNUM >= 10330
-+   { // get&display LcrData
-+       cPlugin *p;
-+       p = cPluginManager::CallFirstService("LcrService-v1.0", NULL);
-+       if (p)
-+       {
-+           LcrService_v1_0 lcrData;
-+           if (cPluginManager::CallFirstService("LcrService-v1.0", &lcrData))
-+           {
-+               if ( strstr( lcrData.destination, "---" ) == NULL )
-+               {
-+                   char lcrStringParts[3][25], lcrString[100];
-+                   strcpy( lcrStringParts[0], (const char *)lcrData.destination );
-+                   strcpy( lcrStringParts[1], (const char *)lcrData.price );
-+                   strcpy( lcrStringParts[2], (const char *)lcrData.pulse );
-+                   sprintf(lcrString, "%s | %s", trimright(lcrStringParts[1]), trimright(lcrStringParts[2]));
-+                   event.presentTitle = trimright(lcrStringParts[0]);
-+                   event.presentSubtitle = trimright(lcrString);
-+               }
-+           }
-+       }
-+   }
-+#endif
- 	mutex.Unlock();
- }
- 
-diff -Naur graphlcd-0.1.3.orig/state.h graphlcd-0.1.3/state.h
---- graphlcd-0.1.3.orig/state.h	2006-01-15 18:19:59.000000000 +0100
-+++ graphlcd-0.1.3/state.h	2006-03-03 17:13:36.801461250 +0100
-@@ -127,4 +127,21 @@
- 	tVolumeState GetVolumeState();
- };
- 
-+// Radiotext
-+struct RadioTextService_v1_0 {
-+  int rds_info;
-+  int rds_pty;
-+  char *rds_text;
-+  char *rds_title;
-+  char *rds_artist;
-+  struct tm *title_start;
-+};
-+
-+// LcrData
-+struct LcrService_v1_0 {
-+  cString destination;
-+  cString price;
-+  cString pulse;
-+};
-+
- #endif
diff --git a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-better-readable-on-medium-displays.diff b/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-better-readable-on-medium-displays.diff
deleted file mode 100644
index 63f2d61066bf..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-better-readable-on-medium-displays.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- display.c.old	2007-01-22 15:40:18.000000000 +0100
-+++ display.c	2007-01-22 15:45:09.000000000 +0100
-@@ -239,7 +239,7 @@
- 		TEXT_OFFSET_Y_CHANNEL = 3;
- 		TEXT_OFFSET_Y_TITLE   = 3;
- 		SYMBOL_SPACE          = 1;
--		TIMEBAR_HEIGHT        = 3;
-+		TIMEBAR_HEIGHT        = 6;
- 	}
- 	else
- 	{
-@@ -1367,14 +1367,14 @@
- 	if (bitmap->Height() >= MINY_L)
- 		nProgressbarHeight = 15;
- 	else if (bitmap->Height() >= MINY_M)
--		nProgressbarHeight = 9;
-+		nProgressbarHeight = 5; // nProgressbarHeight = 9;
- 	else if (bitmap->Height() >= MINY_S)
- 		nProgressbarHeight = 5;
- 	else
- 		nProgressbarHeight = 3;
- 
- 	if (IsLogoActive())
--		nTopY = FRAME_SPACE_Y + logo->Height() + 2;
-+		nTopY = FRAME_SPACE_Y + logo->Height() + 0; // nTopY = FRAME_SPACE_Y + logo->Height() + 2;
- 	else if (GraphLCDSetup.ShowDateTime)
- 		nTopY = FRAME_SPACE_Y + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
- 	else
-@@ -1386,7 +1386,8 @@
- 
- 		nMaxX = std::max(1, bitmap->Width() - (2 * FRAME_SPACE_X) - 2 * TEXT_OFFSET_X);
- 		lineHeight = FRAME_SPACE_Y + largeFont->TotalHeight();
--		maxLines = std::max(0, (bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2 - nTopY) / lineHeight);
-+		maxLines = std::max(0, (bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 0 - nTopY) / lineHeight);
-+		// maxLines = std::max(0, (bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2 - nTopY) / lineHeight);
- 
- 		if (maxLines == 0)
- 		{
diff --git a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-radiotext-lcr-service.diff
deleted file mode 100644
index 8c2c180ab2c2..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-radiotext-lcr-service.diff
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur graphlcd-0.1.4.orig/state.c graphlcd-0.1.4/state.c
---- graphlcd-0.1.4.orig/state.c	2007-02-04 23:35:16.317687570 +0100
-+++ graphlcd-0.1.4/state.c	2007-02-04 23:42:12.065780817 +0100
-@@ -16,6 +16,7 @@
- 
- #include <vdr/eitscan.h>
- #include <vdr/i18n.h>
-+#include <vdr/plugin.h>
- 
- #include "compat.h"
- 
-@@ -654,6 +655,8 @@
- 
- void cGraphLCDState::GetProgramme()
- {
-+    bool ptitle = false;
-+
-     mutex.Lock();
- #if VDRVERSNUM < 10300
-     const cEventInfo * present = NULL, * following = NULL;
-@@ -670,9 +673,11 @@
-                 {
-                     event.presentTime = present->GetTime();
-                     event.presentTitle = "";
--                    if (!isempty(present->GetTitle()))
-+                    if (!isempty(present->GetTitle())) {
-                         event.presentTitle = present->GetTitle();
-                     event.presentSubtitle = "";
-+					ptitle = true;
-+					}
-                     if (!isempty(present->GetSubtitle()))
-                         event.presentSubtitle = present->GetSubtitle();
-                 }
-@@ -704,9 +709,11 @@
-                 {
-                     event.presentTime = present->StartTime();
-                     event.presentTitle = "";
--                    if (!isempty(present->Title()))
-+                    if (!isempty(present->Title())) {
-                         event.presentTitle = present->Title();
-                     event.presentSubtitle = "";
-+					ptitle = true;
-+					}
-                     if (!isempty(present->ShortText()))
-                         event.presentSubtitle = present->ShortText();
-                 }
-@@ -724,6 +731,54 @@
-         }
-     }
- #endif
-+
-+#if VDRVERSNUM >= 10330
-+   { // get&display Radiotext
-+       cPlugin *p;
-+       p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL);
-+       if (p) {
-+           RadioTextService_v1_0 rtext;
-+           if (cPluginManager::CallFirstService("RadioTextService-v1.0", &rtext)) {
-+               if (rtext.rds_info == 2 && strstr(rtext.rds_title, "---") == NULL) {
-+                   char rtpinfo[2][65], rtstr[140];
-+                   strcpy(rtpinfo[0], rtext.rds_title);
-+                   strcpy(rtpinfo[1], rtext.rds_artist);
-+                   sprintf(rtstr, "%02d:%02d  %s | %s", rtext.title_start->tm_hour, rtext.title_start->tm_min, trim(((std::string)(rtpinfo[0]))).c_str(), trim(((std::string)(rtpinfo[1]))).c_str());
-+                       ptitle ? event.presentSubtitle = rtstr : event.presentTitle = rtstr;
-+               }
-+               else if (rtext.rds_info > 0) {
-+                   char rtstr[65];
-+                   strcpy(rtstr, rtext.rds_text);
-+                   ptitle ? event.presentSubtitle = trim(rtstr) : event.presentTitle = trim(rtstr);
-+               }
-+           }
-+       }
-+   }
-+#endif
-+ 
-+#if VDRVERSNUM >= 10330
-+   { // get&display LcrData
-+       cPlugin *p;
-+       p = cPluginManager::CallFirstService("LcrService-v1.0", NULL);
-+       if (p)
-+       {
-+           LcrService_v1_0 lcrData;
-+           if (cPluginManager::CallFirstService("LcrService-v1.0", &lcrData))
-+           {
-+               if ( strstr( lcrData.destination, "---" ) == NULL )
-+               {
-+                   char lcrStringParts[3][25], lcrString[100];
-+                   strcpy( lcrStringParts[0], (const char *)lcrData.destination );
-+                   strcpy( lcrStringParts[1], (const char *)lcrData.price );
-+                   strcpy( lcrStringParts[2], (const char *)lcrData.pulse );
-+                   sprintf(lcrString, "%s | %s", trim((std::string)(lcrStringParts[1])).c_str(), trim((std::string)(lcrStringParts[2])).c_str());
-+                   event.presentTitle = trim(lcrStringParts[0]);
-+                   event.presentSubtitle = trim(lcrString);
-+               }
-+           }
-+       }
-+   }
-+#endif
-     mutex.Unlock();
- }
- 
-diff -Naur graphlcd-0.1.4.orig/state.h graphlcd-0.1.4/state.h
---- graphlcd-0.1.4.orig/state.h	2007-02-04 23:35:16.317687570 +0100
-+++ graphlcd-0.1.4/state.h	2007-02-04 23:43:05.728759351 +0100
-@@ -130,4 +130,21 @@
-     tVolumeState GetVolumeState();
- };
- 
-+// Radiotext
-+struct RadioTextService_v1_0 {
-+  int rds_info;
-+  int rds_pty;
-+  char *rds_text;
-+  char *rds_title;
-+  char *rds_artist;
-+  struct tm *title_start;
-+};
-+
-+// LcrData
-+struct LcrService_v1_0 {
-+  cString destination;
-+  cString price;
-+  cString pulse;
-+};
-+
- #endif
diff --git a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-span.diff b/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-span.diff
deleted file mode 100644
index 949049af050f..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.4/graphlcd-0.1.4-span.diff
+++ /dev/null
@@ -1,356 +0,0 @@
-diff -Naur graphlcd-0.1.4.orig/display.c graphlcd-0.1.4/display.c
---- graphlcd-0.1.4.orig/display.c	2007-02-04 23:10:36.609384554 +0100
-+++ graphlcd-0.1.4/display.c	2007-02-04 23:17:48.756350745 +0100
-@@ -115,6 +115,7 @@
-     nCurrentBrightness = -1;
-     LastTimeBrightness = 0;
-     bBrightnessActive = true;
-+	LastTimeSA.Set(0);
- }
- 
- cGraphLCDDisplay::~cGraphLCDDisplay()
-@@ -373,6 +374,11 @@
-                             update = true;
-                         }
- 
-+						if ( LastTimeSA.TimedOut() )
-+                           {
-+                               update = true;
-+                               LastTimeSA.Set(1000);
-+                           }
-                         // update Display every second or due to an update
-                         if (CurrTime != LastTime || update)
-                         {
-@@ -1460,6 +1466,8 @@
-                           nTopY + nProgressbarHeight,
-                           GLCD::clrBlack, false);
- 
-+	DisplaySA();
-+
-     if (1 < replay.total && 1 < replay.current) // Don't show full progressbar for endless streams
-     {
-         bitmap->DrawRectangle(FRAME_SPACE_X,
-@@ -1945,3 +1953,141 @@
-     }
-     mutex.Unlock();
- }
-+
-+void cGraphLCDDisplay::DisplaySA()
-+{
-+// Spectrum Analyzer visualization
-+   if ( GraphLCDSetup.enableSpectrumAnalyzer )
-+   {
-+       if (cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, NULL))
-+       {
-+           Span_GetBarHeights_v1_0 GetBarHeights;
-+
-+           int bandsSA = 20;
-+           int falloffSA = 8;
-+           int channelsSA = 1;
-+
-+           unsigned int bar;
-+           unsigned int *barHeights = new unsigned int[bandsSA];
-+           unsigned int *barHeightsLeftChannel = new unsigned int[bandsSA];
-+           unsigned int *barHeightsRightChannel = new unsigned int[bandsSA];
-+           unsigned int volumeLeftChannel;
-+           unsigned int volumeRightChannel;
-+           unsigned int volumeBothChannels;
-+           unsigned int *barPeaksBothChannels = new unsigned int[bandsSA];
-+           unsigned int *barPeaksLeftChannel = new unsigned int[bandsSA];
-+           unsigned int *barPeaksRightChannel = new unsigned int[bandsSA];
-+
-+           GetBarHeights.bands                     = bandsSA;
-+           GetBarHeights.barHeights                = barHeights;
-+           GetBarHeights.barHeightsLeftChannel     = barHeightsLeftChannel;
-+           GetBarHeights.barHeightsRightChannel    = barHeightsRightChannel;
-+           GetBarHeights.volumeLeftChannel         = &volumeLeftChannel;
-+           GetBarHeights.volumeRightChannel        = &volumeRightChannel;
-+           GetBarHeights.volumeBothChannels        = &volumeBothChannels;
-+           GetBarHeights.name                      = "graphlcd";
-+           GetBarHeights.falloff                   = falloffSA;
-+           GetBarHeights.barPeaksBothChannels      = barPeaksBothChannels;
-+           GetBarHeights.barPeaksLeftChannel       = barPeaksLeftChannel;
-+           GetBarHeights.barPeaksRightChannel      = barPeaksRightChannel;
-+
-+           if ( cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, &GetBarHeights ))
-+           {
-+               int i;
-+               int barWidth = 2;
-+               int saStartX = FRAME_SPACE_X;
-+               int saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1;
-+               int saStartY = FRAME_SPACE_Y;
-+               int saEndY = FRAME_SPACE_Y + bitmap->Height()/2 - 3;
-+
-+               LastTimeSA.Set(100);
-+
-+               if ( GraphLCDSetup.SAShowVolume )
-+               {
-+
-+                   saStartX = FRAME_SPACE_X  + bitmap->Width()/2 - (barWidth*bandsSA*2 + bandsSA/4)/2 - 2;
-+                   saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1;
-+
-+                   // left volume
-+                   bitmap->DrawRectangle(FRAME_SPACE_X,
-+                       saStartY,
-+                       saStartX-1,
-+                       saEndY + 1,
-+                       GLCD::clrWhite, true);
-+
-+                   for ( i=0; (i<logo->Width()/2-2) && (i<3*(volumeLeftChannel*saStartX)/100); i++)
-+                   {
-+                       bitmap->DrawRectangle(saStartX - i - 2,
-+                           saStartY + saEndY/2 - i,
-+                           saStartX - i - 4,
-+                           saStartY + saEndY/2 + i,
-+                           GLCD::clrBlack, true);
-+                   }
-+
-+                   // right volume
-+                   bitmap->DrawRectangle(saEndX + 1,
-+                       saStartY,
-+                       bitmap->Width() - 1,
-+                       saEndY + 1,
-+                       GLCD::clrWhite, true);
-+
-+                   for ( i=0; (i<logo->Width()/2-2) && (i<3*(volumeRightChannel*saStartX)/100); i++)
-+                   {
-+                       bitmap->DrawRectangle(saEndX + 2 + i,
-+                           saStartY + saEndY/2 - i,
-+                           saEndX + i + 4,
-+                           saStartY + saEndY/2 + i,
-+                           GLCD::clrBlack, true);
-+                   }
-+               }
-+               // black background
-+               bitmap->DrawRectangle(saStartX,
-+                   saStartY,
-+                   saEndX,
-+                   saEndY + 1,
-+                   GLCD::clrBlack, true);
-+
-+               for ( i=0; i < bandsSA; i++ )
-+               {
-+/*                 if ( channelsSA == 2 )
-+                   {
-+                       bar = barHeightsLeftChannel[i];
-+                       bar = barHeightsRightChannel[i];
-+                   }*/
-+                   if ( channelsSA == 1)
-+                   {
-+                       // the bar
-+                       bar = (barHeights[i]*(saEndY-saStartY))/100;
-+                       bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1,
-+                           saEndY,
-+                           saStartX + barWidth*2*(i) + barWidth+ barWidth + 1,
-+                           saEndY - bar,
-+                           GLCD::clrWhite, true);
-+
-+                       // the peak
-+                       bar = (barPeaksBothChannels[i]*(saEndY-saStartY))/100;
-+                       if ( bar > 0 )
-+                       {
-+                           bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1,
-+                               saEndY - bar,
-+                               saStartX + barWidth*2*(i) + barWidth+ barWidth + 1,
-+                               saEndY - bar+1,
-+                               GLCD::clrWhite, true);
-+                       }
-+                   }
-+               }
-+           }
-+
-+           delete [] barHeights;
-+           delete [] barHeightsLeftChannel;
-+           delete [] barHeightsRightChannel;
-+           delete [] barPeaksBothChannels;
-+           delete [] barPeaksLeftChannel;
-+           delete [] barPeaksRightChannel;
-+       }
-+   }
-+}
-+
-+//#############################################################################################
-+
-+
-diff -Naur graphlcd-0.1.4.orig/display.h graphlcd-0.1.4/display.h
---- graphlcd-0.1.4.orig/display.h	2007-02-04 23:10:36.609384554 +0100
-+++ graphlcd-0.1.4/display.h	2007-02-04 23:20:24.209000170 +0100
-@@ -29,10 +29,33 @@
- #include <vdr/thread.h>
- #include <vdr/player.h>
- 
-+#define SPAN_CLIENT_CHECK_ID   "Span-ClientCheck-v1.0"
-+#define SPAN_GET_BAR_HEIGHTS_ID "Span-GetBarHeights-v1.0"
- 
- #define LCDMAXCARDS 4
- static const int kMaxTabCount = 10;
- 
-+struct Span_Client_Check_1_0 {
-+   bool *isActive;
-+   bool *isRunning;
-+};
-+
-+struct Span_GetBarHeights_v1_0 {
-+   unsigned int bands;         // number of bands to compute
-+   unsigned int *barHeights;       // the heights of the bars of the two channels combined
-+   unsigned int *barHeightsLeftChannel;    // the heights of the bars of the left channel
-+   unsigned int *barHeightsRightChannel;   // the heights of the bars of the right channel
-+   unsigned int *volumeLeftChannel;    // the volume of the left channels
-+   unsigned int *volumeRightChannel;   // the volume of the right channels
-+   unsigned int *volumeBothChannels;   // the combined volume of the two channels
-+   const char *name;           // name of the plugin that wants to get the data
-+                       // (must be unique for each client!)
-+   unsigned int falloff;                   // bar falloff value
-+   unsigned int *barPeaksBothChannels;     // bar peaks of the two channels combined
-+   unsigned int *barPeaksLeftChannel;      // bar peaks of the left channel
-+   unsigned int *barPeaksRightChannel;     // bar peaks of the right channel
-+};
-+ 
- enum ThreadState
- {
-     Normal,
-@@ -104,6 +127,7 @@
-     time_t LastTime;
-     time_t LastTimeCheckSym;
-     time_t LastTimeModSym;
-+	cTimeMs LastTimeSA;
-     struct timeval CurrTimeval;
-     struct timeval UpdateAt;
- 
-@@ -125,6 +149,7 @@
-     void DisplayTextItem();
-     void DisplayColorButtons();
-     void DisplayVolume();
-+	void DisplaySA();
- 
-     void UpdateIn(long usec);
-     bool CheckAndUpdateSymbols();
-diff -Naur graphlcd-0.1.4.orig/i18n.c graphlcd-0.1.4/i18n.c
---- graphlcd-0.1.4.orig/i18n.c	2007-02-04 23:10:38.792567843 +0100
-+++ graphlcd-0.1.4/i18n.c	2007-02-04 23:23:31.966096053 +0100
-@@ -966,5 +966,53 @@
- # endif
- #endif
-     },
-+{
-+       "Show spectrum analyzer",
-+       "Zeige Spectrum Analyzer",
-+       "",// TODO Slovenski
-+       "",// TODO Italiano
-+       "",// TODO Nederlands
-+       "",// TODO Portuguçês
-+       "",// TODO Franais
-+       "",// TODO Norsk
-+       "",// TODO Suomi
-+       "",// TODO Polski
-+       "",// TODO Español
-+       "",// TODO Ellinika
-+       "",// TODO Svenska
-+       "",// TODO Romnâã
-+       "",// TODO Magyar
-+       "",// TODO Catalàà
-+#if VDRVERSNUM > 10302
-+       "",// TODO Russian
-+# if VDRVERSNUM > 10307
-+       "",// TODO Croatian
-+# endif
-+#endif
-+   },
-+   {
-+       "Show SA volume",
-+       "Zeige SA Lautstrke",
-+       "",// TODO Slovenski
-+       "",// TODO Italiano
-+       "",// TODO Nederlands
-+       "",// TODO Portugus
-+       "",// TODO Franêçais
-+       "",// TODO Norsk
-+       "",// TODO Suomi
-+       "",// TODO Polski
-+       "",// TODO Español
-+       "",// TODO Ellinika
-+       "",// TODO Svenska
-+       "",// TODO Romnâã
-+       "",// TODO Magyar
-+       "",// TODO Catal
-+#if VDRVERSNUM > 10302
-+       "",// TODO Russian
-+# if VDRVERSNUM > 10307
-+       "",// TODO Croatian
-+# endif
-+#endif
-+   },
-     { NULL }
- };
-diff -Naur graphlcd-0.1.4.orig/menu.c graphlcd-0.1.4/menu.c
---- graphlcd-0.1.4.orig/menu.c	2007-02-04 23:10:38.862563031 +0100
-+++ graphlcd-0.1.4/menu.c	2007-02-04 23:24:53.710477952 +0100
-@@ -101,4 +101,6 @@
-     SetupStore("BrightnessActive", GraphLCDSetup.BrightnessActive = newGraphLCDSetup.BrightnessActive);
-     SetupStore("BrightnessIdle", GraphLCDSetup.BrightnessIdle = newGraphLCDSetup.BrightnessIdle);
-     SetupStore("BrightnessDelay", GraphLCDSetup.BrightnessDelay = newGraphLCDSetup.BrightnessDelay);
-+	SetupStore("enableSpectrumAnalyzer", GraphLCDSetup.enableSpectrumAnalyzer = newGraphLCDSetup.enableSpectrumAnalyzer);
-+	SetupStore("SAShowVolume", GraphLCDSetup.SAShowVolume = newGraphLCDSetup.SAShowVolume);
- }
-diff -Naur graphlcd-0.1.4.orig/plugin.c graphlcd-0.1.4/plugin.c
---- graphlcd-0.1.4.orig/plugin.c	2007-02-04 23:10:38.862563031 +0100
-+++ graphlcd-0.1.4/plugin.c	2007-02-04 23:26:57.655292837 +0100
-@@ -54,6 +54,7 @@
-     virtual cOsdObject * MainMenuAction();
-     virtual cMenuSetupPage * SetupMenu();
-     virtual bool SetupParse(const char * Name, const char * Value);
-+	virtual bool Service(const char *Id, void *Data);
- };
- 
- cPluginGraphLCD::cPluginGraphLCD()
-@@ -243,8 +244,24 @@
-     else if (!strcasecmp(Name, "BrightnessActive")) GraphLCDSetup.BrightnessActive = atoi(Value);
-     else if (!strcasecmp(Name, "BrightnessIdle")) GraphLCDSetup.BrightnessIdle = atoi(Value);
-     else if (!strcasecmp(Name, "BrightnessDelay")) GraphLCDSetup.BrightnessDelay = atoi(Value);
-+	else if (!strcasecmp(Name, "enableSpectrumAnalyzer")) GraphLCDSetup.enableSpectrumAnalyzer = atoi(Value);
-+	else if (!strcasecmp(Name, "SAShowVolume")) GraphLCDSetup.SAShowVolume = atoi(Value);
-     else return false;
-     return true;
- }
- 
-+bool cPluginGraphLCD::Service(const char *Id, void *Data)
-+{
-+   if (strcmp(Id, SPAN_CLIENT_CHECK_ID) == 0)
-+   {
-+       if ( GraphLCDSetup.enableSpectrumAnalyzer && (Data != NULL) )
-+       {
-+           *((Span_Client_Check_1_0*)Data)->isActive = true;
-+       }
-+       return true;
-+   }
-+
-+   return false;
-+}
-+
- VDRPLUGINCREATOR(cPluginGraphLCD); // Don't touch this!
-diff -Naur graphlcd-0.1.4.orig/setup.c graphlcd-0.1.4/setup.c
---- graphlcd-0.1.4.orig/setup.c	2007-02-04 23:10:38.865896137 +0100
-+++ graphlcd-0.1.4/setup.c	2007-02-04 23:27:59.671030635 +0100
-@@ -52,7 +52,9 @@
-     ScrollTime(500),
-     BrightnessActive(100),
-     BrightnessIdle(100),
--    BrightnessDelay(30)
-+    BrightnessDelay(30),
-+	enableSpectrumAnalyzer(1),
-+	SAShowVolume(1)
- {
- }
- 
-diff -Naur graphlcd-0.1.4.orig/setup.h graphlcd-0.1.4/setup.h
---- graphlcd-0.1.4.orig/setup.h	2007-02-04 23:10:38.865896137 +0100
-+++ graphlcd-0.1.4/setup.h	2007-02-04 23:28:55.347204140 +0100
-@@ -54,6 +54,8 @@
-     int BrightnessActive;
-     int BrightnessIdle;
-     int BrightnessDelay;
-+	int enableSpectrumAnalyzer;
-+	int SAShowVolume;
- 
- public:
-     cGraphLCDSetup(void);
diff --git a/media-plugins/vdr-graphlcd/files/0.1.4/vdr-graphlcd-0.1.4-missing-include.patch b/media-plugins/vdr-graphlcd/files/0.1.4/vdr-graphlcd-0.1.4-missing-include.patch
deleted file mode 100644
index e96823bec88e..000000000000
--- a/media-plugins/vdr-graphlcd/files/0.1.4/vdr-graphlcd-0.1.4-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru graphlcd-0.1.4-orig/display.c graphlcd-0.1.4/display.c
---- graphlcd-0.1.4-orig/display.c	2007-02-05 11:32:23.963790615 +0100
-+++ graphlcd-0.1.4/display.c	2007-02-05 11:32:35.890079873 +0100
-@@ -29,6 +29,7 @@
- 
- #include <vdr/tools.h>
- #include <vdr/menu.h>
-+#include <vdr/plugin.h>
- 
- #include "compat.h"
- 
diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff b/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff
new file mode 100644
index 000000000000..2c10c8697420
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff
@@ -0,0 +1,30 @@
+#bug 203856
+
+diff -Naur graphlcd-0.1.5_orig/Makefile graphlcd-0.1.5/Makefile
+--- graphlcd-0.1.5_orig/Makefile	2007-02-05 19:24:03.000000000 +0100
++++ graphlcd-0.1.5/Makefile	2007-12-31 02:08:00.000000000 +0100
+@@ -9,6 +9,9 @@
+ #
+ PLUGIN = graphlcd
+ 
++# define this if you built graphlcd-base with freetype:
++HAVE_FREETYPE2 = 1
++
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' plugin.c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+@@ -51,9 +54,12 @@
+ 
+ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(INSTALLPREFIX)/include
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+-DEFINES += -D_GNU_SOURCE
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
++ifdef HAVE_FREETYPE2
++    INCLUDES += -I$(INSTALLPREFIX)/include/freetype2
++    DEFINES += -DHAVE_FREETYPE2
++endif
+ 
+ ### The object files (add further files here):
+
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1
deleted file mode 100644
index d5efab3b24ad..000000000000
--- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 358e8483887a3ee86f3282aaf0e56522 vdr-graphlcd-0.1.2-pre6.tgz 232345
-RMD160 5e47c30c9a7b5f7649a8cf12c38da73fa9bf76ae vdr-graphlcd-0.1.2-pre6.tgz 232345
-SHA256 3f5d772d392373c744a2945254039cfc4846f505683d90569845ef8be8c8aafd vdr-graphlcd-0.1.2-pre6.tgz 232345
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3
deleted file mode 100644
index 43e2d4af500b..000000000000
--- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4f048e12e61540281682c59bcc28fb2 vdr-graphlcd-0.1.3.tgz 244387
-RMD160 6856258bc3938a4a817fc583f2624c499f595013 vdr-graphlcd-0.1.3.tgz 244387
-SHA256 70cac20084f5613b8f9a5bf08b10564c0e0ce890a87062d323e08739017c74ef vdr-graphlcd-0.1.3.tgz 244387
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3-r1 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3-r1
deleted file mode 100644
index 43e2d4af500b..000000000000
--- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4f048e12e61540281682c59bcc28fb2 vdr-graphlcd-0.1.3.tgz 244387
-RMD160 6856258bc3938a4a817fc583f2624c499f595013 vdr-graphlcd-0.1.3.tgz 244387
-SHA256 70cac20084f5613b8f9a5bf08b10564c0e0ce890a87062d323e08739017c74ef vdr-graphlcd-0.1.3.tgz 244387
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.4 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.4
deleted file mode 100644
index 12528299d02b..000000000000
--- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08e8645f708c7724e193399440940d76 vdr-graphlcd-0.1.4.tgz 240053
-RMD160 88114a3bbf68231428de441c4cf5cc45b0d2e6a4 vdr-graphlcd-0.1.4.tgz 240053
-SHA256 f5cbe57b559d5b68492301bf89eca9ec16022a4bb8c09ccd2727cfeb273ac146 vdr-graphlcd-0.1.4.tgz 240053
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.5-r1 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.5-r1
new file mode 100644
index 000000000000..c9ffdfd1014a
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.5-r1
@@ -0,0 +1,3 @@
+MD5 116c8c62847c2a83be250761f203ad4a vdr-graphlcd-0.1.5.tgz 240133
+RMD160 9d8c6753fca9881d6eb204a88128bc4e8a508966 vdr-graphlcd-0.1.5.tgz 240133
+SHA256 63ccb6e195be639a12cc2b6bb6550acc05eca161226e6692c22c31ec5e7c2769 vdr-graphlcd-0.1.5.tgz 240133
diff --git a/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff
deleted file mode 100644
index 63a47f1bceb9..000000000000
--- a/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru graphlcd-0.1.3-orig/display.c graphlcd-0.1.3/display.c
---- graphlcd-0.1.3-orig/display.c	2006-12-03 16:18:11.526195337 +0100
-+++ graphlcd-0.1.3/display.c	2006-12-03 16:18:47.994898923 +0100
-@@ -2025,7 +2025,7 @@
- 		else
- 		{
- 			if (GraphLCDSetup.BrightnessDelay < 1
--				|| ((TimeMs() - LastTimeBrightness) > (uint64) (GraphLCDSetup.BrightnessDelay*1000)))
-+				|| ((TimeMs() - LastTimeBrightness) > (uint64_t) (GraphLCDSetup.BrightnessDelay*1000)))
- 			{
- 				LCD->SetBrightness(GraphLCDSetup.BrightnessIdle);
- 				nCurrentBrightness = GraphLCDSetup.BrightnessIdle;
-diff -ru graphlcd-0.1.3-orig/display.h graphlcd-0.1.3/display.h
---- graphlcd-0.1.3-orig/display.h	2006-12-03 16:18:11.526195337 +0100
-+++ graphlcd-0.1.3/display.h	2006-12-03 16:18:40.497109608 +0100
-@@ -200,7 +200,7 @@
- 
- 	/** Set Brightness depends user activity */
- 	void SetBrightness();
--	uint64 LastTimeBrightness;
-+	uint64_t LastTimeBrightness;
- 	int nCurrentBrightness;
- 	bool bBrightnessActive;
- };
-diff -ru graphlcd-0.1.3-orig/tags graphlcd-0.1.3/tags
---- graphlcd-0.1.3-orig/tags	2006-12-03 16:18:11.526195337 +0100
-+++ graphlcd-0.1.3/tags	2006-12-03 16:19:05.319033056 +0100
-@@ -71,7 +71,7 @@
- LIBDIR	Makefile	/^LIBDIR = ..\/..\/lib$/;"	m
- LastState	display.h	/^	ThreadState LastState;$/;"	m	class:cGraphLCDDisplay
- LastTime	display.h	/^	time_t LastTime;$/;"	m	class:cGraphLCDDisplay
--LastTimeBrightness	display.h	/^	uint64 LastTimeBrightness;$/;"	m	class:cGraphLCDDisplay
-+LastTimeBrightness	display.h	/^	uint64_t LastTimeBrightness;$/;"	m	class:cGraphLCDDisplay
- LastTimeCheckSym	display.h	/^	time_t LastTimeCheckSym;$/;"	m	class:cGraphLCDDisplay
- LastTimeModSym	display.h	/^	time_t LastTimeModSym;$/;"	m	class:cGraphLCDDisplay
- Load	layout.c	/^bool cFontElement::Load(const std::string & url)$/;"	f	class:cFontElement
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild
deleted file mode 100644
index 688d0e9a9c7b..000000000000
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild,v 1.7 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit eutils vdr-plugin
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR Graphical LCD PlugIn"
-HOMEPAGE="http://www.powarman.de"
-SRC_URI="http://home.arcor.de/andreas.regel/files/graphlcd/${MY_P}.tgz"
-
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="truetype"
-
-S=${WORKDIR}/${VDRPLUGIN}-${MY_PV}
-
-DEPEND=">=media-video/vdr-1.2.6
-		>=app-misc/graphlcd-base-${PV}"
-
-PATCHES="${FILESDIR}/0.1.2/*"
-
-src_unpack() {
-
-	vdr-plugin_src_unpack
-
-	sed -i "s:/usr/local:/usr:" Makefile
-}
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insopts -m0644 -ovdr -gvdr
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/logos
-	doins -r ${VDRPLUGIN}/logos/*
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/fonts
-	doins ${VDRPLUGIN}/fonts/*.fnt
-
-	if use truetype; then
-		for font in /usr/share/fonts/corefonts/*.ttf; do
-			elog ${font}
-			dosym ${font} /usr/share/vdr/graphlcd/fonts
-		done
-	fi
-
-	insinto /etc/vdr/plugins/${VDRPLUGIN}
-	doins ${VDRPLUGIN}/logonames.alias.*
-	doins ${VDRPLUGIN}/fonts.conf.*
-
-	dosym /usr/share/vdr/${VDRPLUGIN}/fonts /etc/vdr/plugins/${VDRPLUGIN}/fonts
-	dosym /usr/share/vdr/${VDRPLUGIN}/logos /etc/vdr/plugins/${VDRPLUGIN}/logos
-	dosym /etc/graphlcd.conf /etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf
-
-	if has_version ">=media-video/vdr-1.3.2" ; then
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	else
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.2 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	fi
-}
-
-pkg_preinst() {
-
-	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
-	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ;then
-
-		elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
-		elog "Press CTRL+C to abbort"
-		epause
-		rmdir -R /etc/vdrplugins/graphlcd/{fonts,logos}
-	fi
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	elog "Add additional options in /etc/conf.d/vdr.graphlcd"
-	elog
-	elog "Please copy or link one of the supplied fonts.conf.*"
-	elog "files in /etc/vdr/plugins/graphlcd/ to"
-	elog "/etc/vdr/plugins/graphlcd/fonts.conf"
-}
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild
deleted file mode 100644
index 1eabbb573399..000000000000
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit eutils vdr-plugin
-
-DESCRIPTION="VDR Graphical LCD Plugin"
-HOMEPAGE="http://graphlcd.berlios.de/"
-SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-
-KEYWORDS="x86 ~amd64"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="truetype"
-
-DEPEND=">=media-video/vdr-1.2.6
-	>=app-misc/graphlcd-base-${PV}"
-
-PATCHES="${FILESDIR}/0.1.3/radiotext-lcr-service.diff
-	${FILESDIR}/0.1.3/graphlcd-0.1.3-span.diff
-	${FILESDIR}/${P}-uint64.diff"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i "s:/usr/local:/usr:" Makefile
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insopts -m0644 -ovdr -gvdr
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/logos
-	doins -r ${VDRPLUGIN}/logos/*
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/fonts
-	doins ${VDRPLUGIN}/fonts/*.fnt
-
-	if use truetype; then
-		for font in /usr/share/fonts/corefonts/*.ttf; do
-			elog ${font}
-			dosym ${font} /usr/share/vdr/graphlcd/fonts
-		done
-	fi
-
-	insinto /etc/vdr/plugins/${VDRPLUGIN}
-	doins ${VDRPLUGIN}/logonames.alias.*
-	doins ${VDRPLUGIN}/fonts.conf.*
-
-	dosym /usr/share/vdr/${VDRPLUGIN}/fonts /etc/vdr/plugins/${VDRPLUGIN}/fonts
-	dosym /usr/share/vdr/${VDRPLUGIN}/logos /etc/vdr/plugins/${VDRPLUGIN}/logos
-	dosym /etc/graphlcd.conf /etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf
-
-	if has_version ">=media-video/vdr-1.3.2" ; then
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	else
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.2 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	fi
-}
-
-pkg_preinst() {
-
-	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
-	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ;then
-
-		elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
-		elog "Press CTRL+C to abbort"
-		epause
-		rmdir -R /etc/vdrplugins/graphlcd/{fonts,logos}
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "Add additional options in /etc/conf.d/vdr.graphlcd"
-	elog
-	elog "Please copy or link one of the supplied fonts.conf.*"
-	elog "files in /etc/vdr/plugins/graphlcd/ to"
-	elog "/etc/vdr/plugins/graphlcd/fonts.conf"
-}
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild
deleted file mode 100644
index 5fa289745d71..000000000000
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild,v 1.5 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit eutils vdr-plugin
-
-DESCRIPTION="VDR Graphical LCD Plugin"
-HOMEPAGE="http://graphlcd.berlios.de/"
-SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="truetype"
-
-DEPEND=">=media-video/vdr-1.2.6
-	>=app-misc/graphlcd-base-${PV}"
-
-PATCHES="${FILESDIR}/0.1.3/*"
-
-src_unpack() {
-
-	vdr-plugin_src_unpack
-
-	sed -i "s:/usr/local:/usr:" Makefile
-}
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insopts -m0644 -ovdr -gvdr
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/logos
-	doins -r ${VDRPLUGIN}/logos/*
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/fonts
-	doins ${VDRPLUGIN}/fonts/*.fnt
-
-	if use truetype; then
-		for font in /usr/share/fonts/corefonts/*.ttf; do
-			elog ${font}
-			dosym ${font} /usr/share/vdr/graphlcd/fonts
-		done
-	fi
-
-	insinto /etc/vdr/plugins/${VDRPLUGIN}
-	doins ${VDRPLUGIN}/logonames.alias.*
-	doins ${VDRPLUGIN}/fonts.conf.*
-
-	dosym /usr/share/vdr/${VDRPLUGIN}/fonts /etc/vdr/plugins/${VDRPLUGIN}/fonts
-	dosym /usr/share/vdr/${VDRPLUGIN}/logos /etc/vdr/plugins/${VDRPLUGIN}/logos
-	dosym /etc/graphlcd.conf /etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf
-
-	if has_version ">=media-video/vdr-1.3.2" ; then
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	else
-		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.2 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-	fi
-}
-
-pkg_preinst() {
-
-	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
-	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ;then
-
-		elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
-		elog "Press CTRL+C to abbort"
-		epause
-		rmdir -R /etc/vdrplugins/graphlcd/{fonts,logos}
-	fi
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	elog "Add additional options in /etc/conf.d/vdr.graphlcd"
-	elog
-	elog "Please copy or link one of the supplied fonts.conf.*"
-	elog "files in /etc/vdr/plugins/graphlcd/ to"
-	elog "/etc/vdr/plugins/graphlcd/fonts.conf"
-}
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.4.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild
index f457c0a3e43e..093c10af62f2 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.4.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.4.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.5-r1.ebuild,v 1.1 2008/01/01 12:04:41 hd_brummy Exp $
 
 inherit eutils vdr-plugin
 
@@ -8,7 +8,7 @@ DESCRIPTION="VDR Graphical LCD Plugin"
 HOMEPAGE="http://graphlcd.berlios.de/"
 SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~x86 ~amd64"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -18,13 +18,28 @@ DEPEND=">=media-video/vdr-1.2.6
 	>=app-misc/graphlcd-base-${PV}"
 
 PATCHES="
-	${FILESDIR}/0.1.4/graphlcd-0.1.4-span.diff
-	${FILESDIR}/0.1.4/graphlcd-0.1.4-radiotext-lcr-service.diff
-	${FILESDIR}/0.1.4/${P}-missing-include.patch"
+	${FILESDIR}/${PV}/graphlcd-${PV}-span.diff
+	${FILESDIR}/${PV}/graphlcd-${PV}-radiotext-lcr-service.diff
+	${FILESDIR}/${PV}/${P}-missing-include.patch
+	${FILESDIR}/${PV}/graphlcd-${PV}_vdr-1.5.3.diff"
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! getent group lp | grep -q vdr; then
+		echo
+		einfo "Add user 'vdr' to group 'lp' for full user access to parport device"
+		echo
+		elog "User vdr added to group lp"
+		gpasswd -a vdr lp
+	fi
+}
 
 src_unpack() {
 	vdr-plugin_src_unpack
 
+	use truetype && epatch "${FILESDIR}/${PV}/${P}-missing-freetyp2.diff"
+
 	sed -i "s:/usr/local:/usr:" Makefile
 }