patch to fix compile / font Probs on VDR >= 1-5-3 added

Package-Manager: portage-2.1.2.9

4 files changed, 273 insertions, 16 deletions

diff --git a/media-plugins/vdr-sysinfo/ChangeLog b/media-plugins/vdr-sysinfo/ChangeLog
index ee75a036fb2d..2015a183a7c1 100644
--- a/media-plugins/vdr-sysinfo/ChangeLog
+++ b/media-plugins/vdr-sysinfo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-sysinfo
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/ChangeLog,v 1.8 2006/11/18 08:29:58 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/ChangeLog,v 1.9 2007/07/03 22:08:26 hd_brummy Exp $
+
+  03 Jul 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff,
+  vdr-sysinfo-0.1.0a-r1.ebuild:
+  patch to fix compile / font Probs on VDR >= 1-5-3 added
 
   18 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   -vdr-sysinfo-0.0.4a.ebuild, -vdr-sysinfo-0.1.0a.ebuild:
diff --git a/media-plugins/vdr-sysinfo/Manifest b/media-plugins/vdr-sysinfo/Manifest
index e94290bac418..41844a3e6153 100644
--- a/media-plugins/vdr-sysinfo/Manifest
+++ b/media-plugins/vdr-sysinfo/Manifest
@@ -13,16 +13,20 @@ AUX vdr-sysinfo-0.1.0a-gentoo.diff 3775 RMD160 b1571ce7156f8041cae6a2ab7d296025c
 MD5 c7bda58bae2b6ca7b8dd9b617c4f1f5c files/vdr-sysinfo-0.1.0a-gentoo.diff 3775
 RMD160 b1571ce7156f8041cae6a2ab7d296025c785f134 files/vdr-sysinfo-0.1.0a-gentoo.diff 3775
 SHA256 0cf523005ce1191fb91d1891683ef78df6649bc44963d36cf245cd29cba71ac0 files/vdr-sysinfo-0.1.0a-gentoo.diff 3775
+AUX vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff 9811 RMD160 db9605a19dac9a4a22f894289c07636f285b0730 SHA1 c8545e9d8fe49249b03272f6ed8a7f54634b606b SHA256 24517b755f16d89a460f34fb0196a7914939c90d7afe7d64880ad3669920765d
+MD5 fdbd20414092a9b575a152254c76908e files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff 9811
+RMD160 db9605a19dac9a4a22f894289c07636f285b0730 files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff 9811
+SHA256 24517b755f16d89a460f34fb0196a7914939c90d7afe7d64880ad3669920765d files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff 9811
 DIST vdr-sysinfo-0.1.0a-firefly-20060520.tar.bz2 9172 RMD160 bb80c0c4b73f6d94b2858dd69dbdf5f975f13d62 SHA1 78681676efe5a012ae2fd07b36ddf4c6bc0e7311 SHA256 7b1eb33ef7cc5ff4f89a0e595f6676e2649516ba9c99a1cef730098107cc947c
 DIST vdr-sysinfo-0.1.0a.tgz 17693 RMD160 336610f72ed3db5338d1c97516741060db629691 SHA1 cf5c66134e2230e6b13758363225e91fa3e09b36 SHA256 5ccfb3e1e06ae32c3b749b4cab67da4c46a9e7e1757a8a4b65ca3899af567f0f
-EBUILD vdr-sysinfo-0.1.0a-r1.ebuild 908 RMD160 d9f9d40c89c5c0cd1b2c93e8d7427bf049c3c030 SHA1 ff5a34358ae65273f93fae7bc50fd27b89fdd635 SHA256 6a2db450c80a2b7ebe56d03213047ba3eecebf9112406261b25c8da7ab1fc116
-MD5 c9804a450507d222e62bf178aeb5e9f4 vdr-sysinfo-0.1.0a-r1.ebuild 908
-RMD160 d9f9d40c89c5c0cd1b2c93e8d7427bf049c3c030 vdr-sysinfo-0.1.0a-r1.ebuild 908
-SHA256 6a2db450c80a2b7ebe56d03213047ba3eecebf9112406261b25c8da7ab1fc116 vdr-sysinfo-0.1.0a-r1.ebuild 908
-MISC ChangeLog 1640 RMD160 b4c152e43f6af871d27fedc1f445e323ceb4de9b SHA1 a9e2fa5b4e57fda58a442eafd2f9690e43c266ce SHA256 ad4b8eccb9a31e2f1927e437943b55e44126b2b8404bcd0168e85295e523abae
-MD5 dc16a8a142b3a0e7ac2916178ab24e69 ChangeLog 1640
-RMD160 b4c152e43f6af871d27fedc1f445e323ceb4de9b ChangeLog 1640
-SHA256 ad4b8eccb9a31e2f1927e437943b55e44126b2b8404bcd0168e85295e523abae ChangeLog 1640
+EBUILD vdr-sysinfo-0.1.0a-r1.ebuild 954 RMD160 40d5f3a7393f1576f6ffe25a24bab94a752015bd SHA1 fb160e925d3db5fcb33179b9106ee08866ddf30c SHA256 ca5e55c5aa1cd7e43c4474b1e9420ac1a7fa95d1aac47a86946c145cdbc3eadb
+MD5 6a56c691fcdcbe81f58198d891ff3e39 vdr-sysinfo-0.1.0a-r1.ebuild 954
+RMD160 40d5f3a7393f1576f6ffe25a24bab94a752015bd vdr-sysinfo-0.1.0a-r1.ebuild 954
+SHA256 ca5e55c5aa1cd7e43c4474b1e9420ac1a7fa95d1aac47a86946c145cdbc3eadb vdr-sysinfo-0.1.0a-r1.ebuild 954
+MISC ChangeLog 1842 RMD160 2eba8f3f627683069bdd1e8915e3d24b6bfe6f8d SHA1 8ef03ad953b50e1486b3dd426d8c8ed960806381 SHA256 ed37fb4b4a5deafeb2dbfd148555eae1b443a3d6804a58ec7e7f6ba5abfda255
+MD5 7f191f9e8b3e14ef045f2c197a0023b8 ChangeLog 1842
+RMD160 2eba8f3f627683069bdd1e8915e3d24b6bfe6f8d ChangeLog 1842
+SHA256 ed37fb4b4a5deafeb2dbfd148555eae1b443a3d6804a58ec7e7f6ba5abfda255 ChangeLog 1842
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -32,8 +36,9 @@ RMD160 8d8adeee88f8217387082b8021fd94bc6135fd08 files/digest-vdr-sysinfo-0.1.0a-
 SHA256 fd2fa630638139e4f7401be42a1b5965886f65375a554f41962c079a8d99d8c3 files/digest-vdr-sysinfo-0.1.0a-r1 548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFFXsSMt2vP6XvVdOcRAkpUAJ9FDIFO7oA3ZTGMXQB6YOiWSfhHJwCcDWsV
-IdKDxTiUIZNBHpRXq5/3nvU=
-=2x9j
+iD8DBQFGisjkdn07HTTCgIoRAp2aAJ0dOGGnptjD1H1r7/9vn0Lnf36f9wCfXMZ6
+t6X62PQLKB/2Grdv9KTb7v8=
+=OpO8
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff
new file mode 100644
index 000000000000..8e3d240ca5d9
--- /dev/null
+++ b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff
@@ -0,0 +1,246 @@
+patch to fix OSD Font Problems with VDR-1.5.3
+and fix kill VDR by call the plugin on OSD
+
+based on fix, found on linuxtv ML
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 03 Jul 2007
+
+diff -Naur sysinfo-0.1.0a.orig/sysinfoosd.c sysinfo-0.1.0a/sysinfoosd.c
+--- sysinfo-0.1.0a.orig/sysinfoosd.c	2007-07-03 23:48:48.943355433 +0200
++++ sysinfo-0.1.0a/sysinfoosd.c	2007-07-03 23:51:42.181449172 +0200
+@@ -81,7 +81,11 @@
+ 	int iHalfWidth = (int)(iWidth/2);
+ 	int iHalfHeight = (int)(iHeight/2);
+ 	asprintf(&cTemp, tr("PLEASE WAIT..."));
++#if VDRVERSNUM >=10503
++	osd->DrawText(iHalfWidth-100, iHalfHeight-20, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(iHalfWidth-100, iHalfHeight-20, cTemp, pal[3],pal[1],font);
++#endif
+ 	free (cTemp);
+ 	DisplayBitmap();
+ }
+@@ -140,15 +144,39 @@
+ 	osd->DrawRectangle(iWidth-129, 0, 2, 33, pal[2]);
+ 	// Draw test
+ 	asprintf(&cTemp, "SysInfo %s", VERSION);
++#if VDRVERSNUM >=10503
++	osd->DrawText(10, 3, cTemp, pal[2],pal[3],cFont::GetFont(fontOsd));
++	free (cTemp);
++	osd->DrawText(iWidth-120, 3, "by Kikko77", pal[2],pal[3],cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(10, 3, cTemp, pal[2],pal[3],font);
+ 	free (cTemp);
+ 	osd->DrawText(iWidth-120, 3, "by Kikko77", pal[2],pal[3],font);	
++#endif
+ }
+ 
+ void cSysInfoOsd::SensorData(int iTop) {
+ 	// Temperature
+ 	char cTemp[100];	// 2DO
+ 	sprintf(cTemp, tr("CPU temperature:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	sprintf(cTemp, tr("M/B temperature:"));
++	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cputemp", cTemp);
++	osd->DrawText(270, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbtemp", cTemp);
++	osd->DrawText(270, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	// Fan rpm
++	sprintf(cTemp, tr("Fan1:"));
++	osd->DrawText(((iWidth/2)+20), iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	sprintf(cTemp, tr("Fan2:"));
++	osd->DrawText(((iWidth/2)+20), iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cpufan", cTemp);
++	osd->DrawText(((iWidth/2)+170), iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbfan", cTemp);
++	osd->DrawText(((iWidth/2)+170), iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+ 	sprintf(cTemp, tr("M/B temperature:"));
+ 	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],font);
+@@ -165,6 +193,7 @@
+ 	osd->DrawText(((iWidth/2)+170), iTop+10, cTemp, pal[3],pal[1],font);
+ 	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbfan", cTemp);
+ 	osd->DrawText(((iWidth/2)+170), iTop+40, cTemp, pal[3],pal[1],font);
++#endif
+ 	// Draw line separator
+ 	osd->DrawRectangle(iTop+74, 0, iWidth, 1, pal[2]);
+ }
+@@ -173,9 +202,15 @@
+ void cSysInfoOsd::VideoSpace(int iTop) {
+ 	char cTemp[100];	// 2DO
+ 	sprintf(cTemp, tr("Video disk free space:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh vidspace", cTemp);
++	osd->DrawText(285, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+ 	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh vidspace", cTemp);
+ 	osd->DrawText(285, iTop+10, cTemp, pal[3],pal[1],font);
++#endif
+ 	// Draw line separator
+ 	osd->DrawRectangle(iTop+46, 0, iWidth, 1, pal[2]);
+ }
+@@ -184,6 +219,22 @@
+ 	char cTemp[100];	// 2DO
+ 	
+ 	sprintf(cTemp, tr("Linux kernel:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, 40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	sprintf(cTemp, tr("CPU type:"));
++	osd->DrawText(15, 70, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	// Kernel and cpu type
++	ExecShellCmd("uname -r", cTemp);
++	osd->DrawText(160, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("cat /proc/cpuinfo | grep 'processor' |grep '1'", cTemp);
++	if (cTemp[0]=='\0') {
++		ExecShellCmd("cat /proc/cpuinfo | grep 'model name' | cut -c 14-58 | uniq", cTemp);
++		osd->DrawText(160, iTop+70, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	} else {
++		ExecShellCmd("cat /proc/cpuinfo | grep 'model name' | cut -c 14-58 | uniq", cTemp);
++		osd->DrawText(160, iTop+70, "2 x ", pal[3],pal[1],cFont::GetFont(fontOsd));
++		osd->DrawText(200, iTop+70, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(15, 40, cTemp, pal[3],pal[1],font);
+ 	sprintf(cTemp, tr("CPU type:"));
+ 	osd->DrawText(15, 70, cTemp, pal[3],pal[1],font);
+@@ -198,6 +249,7 @@
+ 		ExecShellCmd("cat /proc/cpuinfo | grep 'model name' | cut -c 14-58 | uniq", cTemp);
+ 		osd->DrawText(160, iTop+70, "2 x ", pal[3],pal[1],font);
+ 		osd->DrawText(200, iTop+70, cTemp, pal[3],pal[1],font);
++#endif
+ 	}
+ 	// Draw line separator
+ 	osd->DrawRectangle(iTop+104, 0, iWidth, 1, pal[2]);
+@@ -214,10 +266,17 @@
+ 
+ 	// Cpu Speed
+ 	sprintf(cTemp, tr("CPU speed:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("cat /proc/cpuinfo | grep 'cpu MHz' | cut -c 12-60", cTemp);
++	asprintf(&cTmp, "%d MHz", atoi(cTemp));
++	osd->DrawText(190, iTop+10, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 110, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+ 	ExecShellCmd("cat /proc/cpuinfo | grep 'cpu MHz' | cut -c 12-60", cTemp);
+ 	asprintf(&cTmp, "%d MHz", atoi(cTemp));
+ 	osd->DrawText(190, iTop+10, cTmp, pal[3],pal[1],font, 110, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// Calculate cpu free
+@@ -226,16 +285,28 @@
+ 	iPerCentCpu=atoi(cTemp);
+ 	if (iPerCentCpu>100) iPerCentCpu=100;
+ 	sprintf(cTemp, tr("CPU used:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	asprintf(&cTmp, "%d%%", iPerCentCpu);
++	osd->DrawText(215, iTop+40, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 85, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],font);
+ 	asprintf(&cTmp, "%d%%", iPerCentCpu);
+ 	osd->DrawText(215, iTop+40, cTmp, pal[3],pal[1],font, 85, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// CPU free
+ 	sprintf(cTemp, tr("CPU free:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	asprintf(&cTmp, "%d%%", 100-iPerCentCpu);
++	osd->DrawText(215, iTop+40, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 85, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+70, cTemp, pal[3],pal[1],font);
+ 	asprintf(&cTmp, "%d%%", 100-iPerCentCpu);
+ 	osd->DrawText(215, iTop+70, cTmp, pal[3],pal[1],font, 85, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// Cpu Graph
+@@ -259,30 +330,55 @@
+ 	
+ 	// total memory
+ 	sprintf(cTemp, tr("Total memory:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMTOTAL' | cut -c 16-23 | tr -d ' '", cTemp);
++	dTemp=atof(cTemp);
++	int iMemTotal=(int)(dTemp/1024);
++	asprintf(&cTmp, "%d MB", iMemTotal);
++	osd->DrawText(215, iTop+10, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 85, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+ 	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMTOTAL' | cut -c 16-23 | tr -d ' '", cTemp);
+ 	dTemp=atof(cTemp);
+ 	int iMemTotal=(int)(dTemp/1024);
+ 	asprintf(&cTmp, "%d MB", iMemTotal);
+ 	osd->DrawText(215, iTop+10, cTmp, pal[3],pal[1],font, 85, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// Free memory
+ 	sprintf(cTemp, tr("Free memory:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMFREE' | cut -c 16-23 | tr -d ' '", cTemp);
++	dTemp=atof(cTemp);
++	int iMemFree=(int)(dTemp/1024);
++	asprintf(&cTmp, "%d MB", iMemFree);
++	osd->DrawText(215, iTop+40, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 85, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],font);
+ 	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMFREE' | cut -c 16-23 | tr -d ' '", cTemp);
+ 	dTemp=atof(cTemp);
+ 	int iMemFree=(int)(dTemp/1024);
+ 	asprintf(&cTmp, "%d MB", iMemFree);
+ 	osd->DrawText(215, iTop+40, cTmp, pal[3],pal[1],font, 85, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// Used memory
+ 	sprintf(cTemp, tr("Used memory:"));
++#if VDRVERSNUM >=10503
++	osd->DrawText(15, iTop+70, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd));
++	int iMemUsed=iMemTotal-iMemFree;
++	asprintf(&cTmp, "%d MB", iMemUsed);
++	osd->DrawText(215, iTop+70, cTmp, pal[3],pal[1],cFont::GetFont(fontOsd), 85, 0, taRight);
++#else
+ 	osd->DrawText(15, iTop+70, cTemp, pal[3],pal[1],font);
+ 	int iMemUsed=iMemTotal-iMemFree;
+ 	asprintf(&cTmp, "%d MB", iMemUsed);
+ 	osd->DrawText(215, iTop+70, cTmp, pal[3],pal[1],font, 85, 0, taRight);
++#endif
+ 	free(cTmp);
+ 
+ 	// Mem Graph
+@@ -336,7 +432,11 @@
+ 	//static const cFont *font = cFont::GetFont(fontOsd);
+ 	char *cTmp;
+ 	asprintf(&cTmp, "%d %%", iValue);
++#if VDRVERSNUM >=10503
++	osd->DrawText(iTextLeft, iTextTop, cTmp, pal[3], pal[2], cFont::GetFont(fontOsd));
++#else
+ 	osd->DrawText(iTextLeft, iTextTop, cTmp, pal[3], pal[2], font);
++#endif
+ 	free(cTmp);
+ 
+ 	//oProgressOsd->DrawText(iTextLeft, iTextTop, cTemp, pal[3], pal[2], font);
+diff -Naur sysinfo-0.1.0a.orig/sysinfoosd.h sysinfo-0.1.0a/sysinfoosd.h
+--- sysinfo-0.1.0a.orig/sysinfoosd.h	2007-07-03 23:48:48.963354060 +0200
++++ sysinfo-0.1.0a/sysinfoosd.h	2007-07-03 23:49:21.531115750 +0200
+@@ -5,8 +5,10 @@
+ #include <vdr/menuitems.h>
+ #include <ctype.h>
+ 
++#if VDRVERSNUM <10503
+ static const cFont *font = cFont::GetFont(fontOsd);
+ static const int LINEHEIGHT = font->Height();
++#endif
+ #define NBLINES 4
+ 
+ class cSysInfoOsd : public cThread, public cOsdObject {
diff --git a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild
index a010764a368e..4cd5898f9dc4 100644
--- a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild
+++ b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild,v 1.3 2006/11/18 08:27:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild,v 1.4 2007/07/03 22:08:26 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -20,7 +20,8 @@ RDEPEND="sys-apps/lm_sensors"
 
 PATCHES="${DISTDIR}/${P}-firefly-20060520.tar.bz2
 		${FILESDIR}/${P}-gentoo.diff
-		${FILESDIR}/${P}-gcc4.diff"
+		${FILESDIR}/${P}-gcc4.diff
+		${FILESDIR}/${P}_vdr-1.5.3-gentoo.diff"
 
 VDR_CONFD_FILE="${FILESDIR}/confd-${PV}"