r4929 - in /vdr/vdr-plugin-prefermenu/trunk/debian: changelog patches/00list patches/90_prefermenu-0.6.6-1.5.3.dpatch

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Thu Jul  5 00:01:14 2007
New Revision: 4929

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4929
Log:
Added 90_prefermenu-0.6.6-1.5.3.dpatch

Added:
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch
Modified:
    vdr/vdr-plugin-prefermenu/trunk/debian/changelog
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/changelog?rev=4929&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog Thu Jul  5 00:01:14 2007
@@ -1,3 +1,9 @@
+vdr-plugin-prefermenu (0.6.6-11) unstable; urgency=low
+
+  * Added 90_prefermenu-0.6.6-1.5.3.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu,  5 Jul 2007 01:59:53 +0200
+
 vdr-plugin-prefermenu (0.6.6-10) unstable; urgency=low
 
   * Release for vdrdevel 1.5.5

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list?rev=4929&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list Thu Jul  5 00:01:14 2007
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 02_Makefile-GNU_SOURCE-fix
+90_prefermenu-0.6.6-1.5.3

Added: vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch?rev=4929&op=file
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch (added)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch Thu Jul  5 00:01:14 2007
@@ -1,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+ at DPATCH@
+--- prefermenu-0.6.6/prefermenu.c
++++ prefermenu-0.6.6/prefermenu.c
+@@ -75,6 +75,7 @@
+   }
+   // Clean up the file with current VDR channels.conf
+   PreferedChannelsList.Save();
++  const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+   config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE;
+   return new cPreferOsd;
+ }
+--- prefermenu-0.6.6/preferosd.c
++++ prefermenu-0.6.6/preferosd.c
+@@ -60,6 +60,7 @@
+   }
+   osd=cOsdProvider::NewOsd(config.originx, config.originy);
+   if (osd) {
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
+     osd->SetAreas(&Area, 1);
+     DrawPreferMenu(0,0);
+@@ -168,6 +169,7 @@
+ {
+   if (current > 1) {
+     current -= 1;
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     DrawPreferMenu(-LINEHEIGHT,1);
+     DisplayPreferMenu();
+     //DrawPreferMneu(-10,1);
+@@ -181,6 +183,7 @@
+ {
+   if (current < number) {
+     current += 1;     
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     DrawPreferMenu(+LINEHEIGHT,-1);
+     DisplayPreferMenu();
+     //DrawPreferMenu(+10,-1);
+@@ -315,6 +318,8 @@
+ 
+ void cPreferOsd::DrawPreferMenu(int delta, int highlight)
+ {
++  const cFont *font = cFont::GetFont(fontOsd);
++  const int LINEHEIGHT = font->Height();
+   
+   int middle = int(config.height/2) + config.height%2;
+ 
+@@ -390,6 +395,8 @@
+ 
+ void cPreferOsd::DrawChannelsNames(int delta)
+ {
++  const cFont *font = cFont::GetFont(fontOsd);
++  const int LINEHEIGHT = font->Height();
+ 
+   // XXX The margin is hardcoded for now
+   // TODO: make it more flexible
+--- prefermenu-0.6.6/preferosd.h
++++ prefermenu-0.6.6/preferosd.h
+@@ -4,8 +4,6 @@
+ #include <vdr/plugin.h>
+ 
+ static const int BORDERSIZE = 2;
+-static const cFont *font = cFont::GetFont(fontOsd);
+-static const int LINEHEIGHT = font->Height();
+ 
+ 
+ class cPreferOsd : public cOsdObject {