diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-11-26 21:02:18 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-11-26 21:02:18 +0000 |
commit | e6a71dae28072982c6b890a9cbd937c21bd4bb37 (patch) | |
tree | ad59637e0504ca3bb0838687494e25544e1ea8a1 /media-plugins | |
parent | fixed wrt bug #420883 #414177 (diff) | |
download | historical-e6a71dae28072982c6b890a9cbd937c21bd4bb37.tar.gz historical-e6a71dae28072982c6b890a9cbd937c21bd4bb37.tar.bz2 historical-e6a71dae28072982c6b890a9cbd937c21bd4bb37.zip |
media-plugins/vdr-sysinfo removal (pending 15 Sep 2013), see #414275 #414177 for referency
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/vdr-sysinfo/ChangeLog | 54 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/Manifest | 9 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/files/confd-0.1.0a | 16 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gcc4.diff | 18 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff | 101 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff | 246 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/metadata.xml | 12 | ||||
-rw-r--r-- | media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild | 33 |
8 files changed, 0 insertions, 489 deletions
diff --git a/media-plugins/vdr-sysinfo/ChangeLog b/media-plugins/vdr-sysinfo/ChangeLog deleted file mode 100644 index b622f8e12df4..000000000000 --- a/media-plugins/vdr-sysinfo/ChangeLog +++ /dev/null @@ -1,54 +0,0 @@ -# ChangeLog for media-plugins/vdr-sysinfo -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/ChangeLog,v 1.10 2007/07/04 10:55:22 hd_brummy Exp $ - - 04 Jul 2007; Joerg Bornkessel <hd_brummy@gentoo.org> - files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff: - small fix in patch - - 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: - Cleanup of old versions. - - 18 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> - vdr-sysinfo-0.1.0a-r1.ebuild: - Marked stable on x86. - - 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml: - Assigned to Gentoo VDR Project. - - 08 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-sysinfo-0.1.0a-gcc4.diff, vdr-sysinfo-0.1.0a-r1.ebuild: - Added gcc4-compatibility patch. - -*vdr-sysinfo-0.1.0a-r1 (22 May 2006) - - 22 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> +files/confd-0.1.0a, - +files/vdr-sysinfo-0.1.0a-gentoo.diff, vdr-sysinfo-0.0.4a.ebuild, - vdr-sysinfo-0.1.0a.ebuild, +vdr-sysinfo-0.1.0a-r1.ebuild: - in -r1 Version added patch http://www.vdr-portal.de/board/thread.php?postid=468888#post468888 - make variables configurable in vdr.sysinfo conf file - RDEPEND inherit in 0.0.4a & 0.1.0a fixed - -*vdr-sysinfo-0.1.0a (01 May 2006) - - 01 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> - +vdr-sysinfo-0.1.0a.ebuild: - version bump - - 31 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org> - vdr-sysinfo-0.0.4a.ebuild: - ~amd64 added; thanks to Bjoern Mueller for reporting/testing this; ebuild - cleanup - -*vdr-sysinfo-0.0.4a (24 Mar 2006) - - 24 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> +metadata.xml, - +vdr-sysinfo-0.0.4a.ebuild: - Imported ebuild from gentoo.de - diff --git a/media-plugins/vdr-sysinfo/Manifest b/media-plugins/vdr-sysinfo/Manifest deleted file mode 100644 index e6565955f6e9..000000000000 --- a/media-plugins/vdr-sysinfo/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX confd-0.1.0a 443 RMD160 e64168f3b4d44279d79a3f3038c30fdc1733be73 SHA1 75f9f87e1791aa8f315df438de526a7d2bf7183b SHA256 05c4f0dc4f39e987ff110c7844e0c7c1419c86f6116ea92476b1c15f49fd7aa5 -AUX vdr-sysinfo-0.1.0a-gcc4.diff 641 RMD160 e26fa5fb6a82491796b73a995f8c8d10b574264f SHA1 2bed6f0bb34488818874bc873d200886780d6a5c SHA256 0f2056899e92d1e13e2f2c315ab53a9ba345b20b66104afaac586d52d6fb0e60 -AUX vdr-sysinfo-0.1.0a-gentoo.diff 3775 RMD160 b1571ce7156f8041cae6a2ab7d296025c785f134 SHA1 4bfa6c5f626158f84409f95984c133578f47d802 SHA256 0cf523005ce1191fb91d1891683ef78df6649bc44963d36cf245cd29cba71ac0 -AUX vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff 9811 RMD160 023ec841efc6ef7dceb6e6a5749957381447824f SHA1 382cb00a239fba1c9c2ff52ec3c0337cea7367f6 SHA256 e336b7b526ab1e19a8725f2965c06f57b084d4ceac60689636047d9bc1a312d8 -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 954 RMD160 40d5f3a7393f1576f6ffe25a24bab94a752015bd SHA1 fb160e925d3db5fcb33179b9106ee08866ddf30c SHA256 ca5e55c5aa1cd7e43c4474b1e9420ac1a7fa95d1aac47a86946c145cdbc3eadb -MISC ChangeLog 1970 RMD160 d41ae34dbc43989608af4a56e159ad8f2902dca9 SHA1 e4d73ace4c7dcf72d6f5c0685faa3dae6efa3cc1 SHA256 3e5b4ae5f889e07b7df52f45f915d155d938320a1a0ad14210d4dca41d6fcca7 -MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 diff --git a/media-plugins/vdr-sysinfo/files/confd-0.1.0a b/media-plugins/vdr-sysinfo/files/confd-0.1.0a deleted file mode 100644 index 66eacf48e6f8..000000000000 --- a/media-plugins/vdr-sysinfo/files/confd-0.1.0a +++ /dev/null @@ -1,16 +0,0 @@ -# Global config file for VDR sysinfo plugin -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/files/confd-0.1.0a,v 1.1 2006/05/22 21:18:15 hd_brummy Exp $ - -# I most cases here is no user activity needed -# Yust if you get wrong or no output in OSD of plugin -# you have something to change on next parameter -# Get right parameter by run 'sensors' on Konsole - -#CPU_TEMP="CPU Temp" - -#MOBO_TEMP="M/B Temp" - -#FAN_1="fan2" - -#FAN_2="fan1" - diff --git a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gcc4.diff b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gcc4.diff deleted file mode 100644 index dfd75a0f8479..000000000000 --- a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gcc4.diff +++ /dev/null @@ -1,18 +0,0 @@ -Nur in sysinfo-0.1.0a: libvdr-sysinfo.so. -Nur in sysinfo-0.1.0a: libvdr-sysinfo.so.1.4.1. -Nur in sysinfo-0.1.0a: sysinfo.o. -diff -ru sysinfo-0.1.0a-orig/sysinfoosd.h sysinfo-0.1.0a/sysinfoosd.h ---- sysinfo-0.1.0a-orig/sysinfoosd.h 2006-07-08 21:25:20.317015369 +0200 -+++ sysinfo-0.1.0a/sysinfoosd.h 2006-07-08 21:25:36.534592954 +0200 -@@ -40,8 +40,8 @@ - - void SendPalette(void); - void SetColor(int Index, int Red, int Green, int Blue, int Alpha); -- void cSysInfoOsd::PleaseWait(); -- void cSysInfoOsd::ShowData(); -+ void PleaseWait(); -+ void ShowData(); - - void DrawMenu(); - void DisplayBitmap(); -Nur in sysinfo-0.1.0a: sysinfoosd.o. diff --git a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff deleted file mode 100644 index 9dbede1299bd..000000000000 --- a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff +++ /dev/null @@ -1,101 +0,0 @@ -fix some path to sysinfo.sh on gentoo install -sysinfo.sh prepared to use /etc/conf.d/vdr.sysinfo - -Joerg Bornkessel hd_brummy@gentoo.org ( 22 May 2006 ) - -diff -Naur sysinfo-0.1.0a.orig/script/sysinfo.sh sysinfo-0.1.0a/script/sysinfo.sh ---- sysinfo-0.1.0a.orig/script/sysinfo.sh 2006-05-22 18:53:38.770308750 +0200 -+++ sysinfo-0.1.0a/script/sysinfo.sh 2006-05-22 18:54:25.325218250 +0200 -@@ -1,31 +1,35 @@ - #!/bin/bash - -+source /etc/conf.d/vdr.sysinfo -+ - case "$1" in - cputemp) -- sensors | grep -i 'CPU TEMP' | cut -c 10-18 | tr -d ' ' -- exit $? -+ sensors | grep -i ${CPU_TEMP:=CPU Temp} | cut -c 10-18 | tr -d ' ' - ;; - cpufan) -- sensors | grep -i 'FAN1' | cut -c 10-18 | tr -d ' ' -- exit $? -+ sensors | grep -i ${FAN_1:=FAN1} | cut -c 10-18 | tr -d ' ' - ;; -+ cputime) -+ ps -eo%C | awk '/[.]/ { a=a+$1 } ; END { print a }' -+ ;; - mbtemp) -- sensors | grep -i 'M/B TEMP' | cut -c 10-18 | tr -d ' ' -- exit $? -+ sensors | grep -i ${MOBO_TEMP:=M/B Temp} | cut -c 10-18 | tr -d ' ' - ;; - mbfan) -- sensors | grep -i 'FAN2' | cut -c 10-18 | tr -d ' ' -- exit $? -+ sensors | grep -i ${FAN_2:=FAN2} | cut -c 10-18 | tr -d ' ' - ;; - vidspace) -- df -h | grep hda1 | cut -c 33-38 | tr -d ' ' -- exit $? -+ df -h | grep hd | grep video | awk '{ print $4}' - ;; - *) -- echo "" -- echo "Usage: sysinfo.sh {cputemp|cpufan|mbtemp|mbfan|vidspace}" -- echo "" -+ echo "Usage: sysinfo.sh {cputemp|cpufan|cputime|mbtemp|mbfan|vidspace}" - exit 1 - ;; - esac -+ -+case ${PIPESTATUS[@]} in -+ 0|'0 0'*) exit 0 ;; -+ *) exit 1 ;; -+esac -+ - exit 0 -diff -Naur sysinfo-0.1.0a.orig/sysinfoosd.c sysinfo-0.1.0a/sysinfoosd.c ---- sysinfo-0.1.0a.orig/sysinfoosd.c 2006-05-22 18:53:38.770308750 +0200 -+++ sysinfo-0.1.0a/sysinfoosd.c 2006-05-22 18:56:07.627611750 +0200 -@@ -152,18 +152,18 @@ - 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); -- ExecShellCmd("sysinfo.sh cputemp", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cputemp", cTemp); - osd->DrawText(270, iTop+10, cTemp, pal[3],pal[1],font); -- ExecShellCmd("sysinfo.sh mbtemp", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbtemp", cTemp); - osd->DrawText(270, iTop+40, cTemp, pal[3],pal[1],font); - // Fan rpm - sprintf(cTemp, tr("Fan1:")); - osd->DrawText(((iWidth/2)+20), iTop+10, cTemp, pal[3],pal[1],font); - sprintf(cTemp, tr("Fan2:")); - osd->DrawText(((iWidth/2)+20), iTop+40, cTemp, pal[3],pal[1],font); -- ExecShellCmd("sysinfo.sh cpufan", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cpufan", cTemp); - osd->DrawText(((iWidth/2)+170), iTop+10, cTemp, pal[3],pal[1],font); -- ExecShellCmd("sysinfo.sh mbfan", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbfan", cTemp); - osd->DrawText(((iWidth/2)+170), iTop+40, cTemp, pal[3],pal[1],font); - // Draw line separator - osd->DrawRectangle(iTop+74, 0, iWidth, 1, pal[2]); -@@ -174,7 +174,7 @@ - char cTemp[100]; // 2DO - sprintf(cTemp, tr("Video disk free space:")); - osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font); -- ExecShellCmd("sysinfo.sh vidspace", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh vidspace", cTemp); - osd->DrawText(285, iTop+10, cTemp, pal[3],pal[1],font); - // Draw line separator - osd->DrawRectangle(iTop+46, 0, iWidth, 1, pal[2]); -@@ -222,7 +222,7 @@ - - // Calculate cpu free - //ExecShellCmd("CPU=0; for I in `ps -eo ""%C"" | grep ""\\.""`; do CPU=`echo $CPU $I | awk '{ print $1 + $2 }'`; done; echo $CPU", cTemp); -- ExecShellCmd("sysinfo.sh cputime", cTemp); -+ ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cputime", cTemp); - iPerCentCpu=atoi(cTemp); - if (iPerCentCpu>100) iPerCentCpu=100; - sprintf(cTemp, tr("CPU used:")); 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 deleted file mode 100644 index 7f7d2308dc55..000000000000 --- a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a_vdr-1.5.3-gentoo.diff +++ /dev/null @@ -1,246 +0,0 @@ -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+70, cTemp, pal[3],pal[1],cFont::GetFont(fontOsd)); -+ asprintf(&cTmp, "%d%%", 100-iPerCentCpu); -+ 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); - 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/metadata.xml b/media-plugins/vdr-sysinfo/metadata.xml deleted file mode 100644 index d1b88e6872a7..000000000000 --- a/media-plugins/vdr-sysinfo/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-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild deleted file mode 100644 index 4cd5898f9dc4..000000000000 --- a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild +++ /dev/null @@ -1,33 +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-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild,v 1.4 2007/07/03 22:08:26 hd_brummy Exp $ - -inherit vdr-plugin eutils - -DESCRIPTION="VDR plugin: Shows information over your system (CPU/Memory usage ...)" -HOMEPAGE="http://kikko77.altervista.org/" -SRC_URI="http://kikko77.altervista.org/sections/Download/[12]_sysinfo/${P}.tgz - mirror://gentoo/${P}-firefly-20060520.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 x86" -IUSE="" - -DEPEND=">=media-video/vdr-1.3.7" - -RDEPEND="sys-apps/lm_sensors" - -PATCHES="${DISTDIR}/${P}-firefly-20060520.tar.bz2 - ${FILESDIR}/${P}-gentoo.diff - ${FILESDIR}/${P}-gcc4.diff - ${FILESDIR}/${P}_vdr-1.5.3-gentoo.diff" - -VDR_CONFD_FILE="${FILESDIR}/confd-${PV}" - -src_install() { - vdr-plugin_src_install - insinto /usr/share/vdr/sysinfo/ - insopts -m0755 - doins script/sysinfo.sh -} |