r6515 - in /vdr/vdr-plugin-console/trunk/debian: changelog patches/00list patches/94_console-1.6.0.dpatch rules

[tschmidt at users.alioth.debian.org]

Author: tschmidt
Date: Mon Mar 24 17:40:42 2008
New Revision: 6515

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6515
Log:
* Added 94_console-1.6.0.dpatch, to fix compilation for vdr 1.6.0,
  many thanks to Tobias Grimm for the fix

Added:
    vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch   (with props)
Modified:
    vdr/vdr-plugin-console/trunk/debian/changelog
    vdr/vdr-plugin-console/trunk/debian/patches/00list
    vdr/vdr-plugin-console/trunk/debian/rules

Modified: vdr/vdr-plugin-console/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/changelog?rev=6515&op=diff
==============================================================================
--- vdr/vdr-plugin-console/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-console/trunk/debian/changelog Mon Mar 24 17:40:42 2008
@@ -5,8 +5,10 @@
   * Added Homepage field to debian/control
   * Renamed XS-Vcs-* fields to Vcs-* in debian/control
   * Bumped Standards-Version to 3.7.3
-
- -- Thomas Schmidt <tschmidt at debian.org>  Sun, 23 Mar 2008 13:54:06 +0100
+  * Added 94_console-1.6.0.dpatch, to fix compilation for vdr 1.6.0,
+    many thanks to Tobias Grimm for the fix
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Mon, 24 Mar 2008 18:40:21 +0100
 
 vdr-plugin-console (0.6.0-34) experimental; urgency=low
 

Modified: vdr/vdr-plugin-console/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/patches/00list?rev=6515&op=diff
==============================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-console/trunk/debian/patches/00list Mon Mar 24 17:40:42 2008
@@ -4,3 +4,4 @@
 90_APIVERSION
 92_console-1.3.18
 93_console-1.5.0
+94_console-1.6.0

Added: vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch?rev=6515&op=file
==============================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch (added)
+++ vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch Mon Mar 24 17:40:42 2008
@@ -1,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_console-1.6.0.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with vdr 1.6.0
+
+ at DPATCH@
+--- vdr-plugin-console-0.6.0.orig/menu.c
++++ vdr-plugin-console-0.6.0/menu.c
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-#include "fontsmallfix.c"
++//#include "fontsmallfix.c"
+ #include "symbols/bell.xpm"
+ #include "symbols/keyboard.xpm"
+ 
+@@ -59,31 +59,11 @@
+     if (backColor != clrConsoleTransparent)
+       bitmap.DrawRectangle(x, y, x + w - 1, y + h - 1, backColor);
+ 
+-    const cFont::tCharData* CharData = font.CharData(ch);
++    char text[2];
++    text[1] = 0;
++    text[0] = ch;
+ 
+-    // Center the char within its cell
+-    x += (w - (int)CharData->width) / 2;
+-    if (w > (int)CharData->width)
+-      w = (int)CharData->width;
+-
+-    for (int row = 0; row < h; ++row) {
+-
+-      cFont::tPixelData PixelData = CharData->lines[row];
+-//@@TEST
+-      PixelData >>= 1;
+-      for (int col = w; col-- > 0;) {
+-
+-        if (PixelData & 1) {
+-          bitmap.SetIndex(x + col, y + row, fg);
+-
+-          // Try to fix flickering
+-//          if (*bitmap.Data(x + col, y + row - 1) != fg)
+-//            bitmap.SetIndex(x + col, y + row + 1, fg);
+-        }
+-
+-        PixelData >>= 1;
+-      }
+-    }
++    bitmap.DrawText(x, y, text, foreColor, backColor, &font);
+ 
+   } else {
+ 
+@@ -794,22 +774,22 @@
+     // Small
+     _pFont = cFont::GetFont(fontSml);
+     _charW = _pFont->Width('A');
+-    _charH = _pFont->Height('A');
++    _charH = _pFont->Height("A");
+ 
+   } else if (_selectedFont == 2) {
+ 
+     // Extra small
+     // The space between the chars can shrink, so more chars can go to the screen.
+-    _pFont = new cFont(consFontSmallFix);
+-    _charW = _pFont->Width('A') - 1;
+-    _charH = _pFont->Height('A') - 1;
++    _pFont = cFont::GetFont(fontOsd);
++    _charW = _pFont->Width('A');
++    _charH = _pFont->Height("A");
+ 
+   } else {
+ 
+     // Normal
+     _pFont = cFont::GetFont(fontFix);
+     _charW = _pFont->Width('A');
+-    _charH = _pFont->Height('A');
++    _charH = _pFont->Height("A");
+   }
+ 
+   _charsW = (_pixelW / _charW);

Propchange: vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: vdr/vdr-plugin-console/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/rules?rev=6515&op=diff
==============================================================================
--- vdr/vdr-plugin-console/trunk/debian/rules (original)
+++ vdr/vdr-plugin-console/trunk/debian/rules Mon Mar 24 17:40:42 2008
@@ -13,7 +13,7 @@
 install::
 	chmod 0755 $(CURDIR)/debian/vdr-plugin-console/usr/share/vdr-plugin-console/default-message
 
-clean::
+cleanbuilddir::
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*