added compile fix for >=vdr-1.5.8, it compiles, but you will miss all character symbols on OSD; unmainted, no upstream available, bug 215683

Package-Manager: portage-2.1.4.4

4 files changed, 112 insertions, 6 deletions

diff --git a/media-plugins/vdr-console/ChangeLog b/media-plugins/vdr-console/ChangeLog
index 40c6d363c88f..34adfce05f4a 100644
--- a/media-plugins/vdr-console/ChangeLog
+++ b/media-plugins/vdr-console/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-console
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/ChangeLog,v 1.4 2006/12/03 14:33:00 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/ChangeLog,v 1.5 2008/07/06 17:12:19 hd_brummy Exp $
+
+  06 Jul 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff,
+  vdr-console-0.6.0.ebuild:
+  added compile fix for >=vdr-1.5.8, it compiles, but you will miss all
+  character symbols on OSD; unmainted, no upstream available, bug 215683
 
   03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-console-0.6.0-uint64.diff, vdr-console-0.6.0.ebuild:
diff --git a/media-plugins/vdr-console/Manifest b/media-plugins/vdr-console/Manifest
index 73f5fdf09f3a..2482dc6282b8 100644
--- a/media-plugins/vdr-console/Manifest
+++ b/media-plugins/vdr-console/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-console-0.6.0-uint64.diff 1140 RMD160 3dce01ae9f4899374a3c4250bca9e81390f1e6fa SHA1 e1f22b809c4072cd2822b068534b85d6a195775b SHA256 bc2bcdcb5ec45cbfbe848d9063f411934ce17817ca76674c667f45b19903af99
 AUX vdr-console-0.6.0-vdr-1.3.18.diff 1784 RMD160 f55b957987198730cab64931e8490aa87b91e2a3 SHA1 6d26a7f86a5dfa8b68a6492805a8b283dd6ee461 SHA256 fb8e2a6e0c9a06ad0f6fc803403f21178298f561950d22dcd1a2ea9dad2b135a
+AUX vdr-console-0.6.0-vdr-1.6.x-compilefix.diff 2096 RMD160 ecd5c25c13ccf4b811e3f115bfd01b692a7b906b SHA1 319ba5b2dbc6f5d66ab26613f8f1d70ccf47b2c9 SHA256 a41ae9aa7ae68375ca11d1edecd7fd1997e1f59bb5246b1b4a96bc9926160d3f
 DIST vdr-console-0.6.0.tgz 47133 RMD160 eebad2c7289e3b3fc4c988d151a19a7fa44e0167 SHA1 4f6ca0f85c806e245c1ce21c2a090dfa36fedf65 SHA256 34809cb7df4728b15dca1de10e66d8cafb12f1d175a8f929b8da273a62e36261
-EBUILD vdr-console-0.6.0.ebuild 561 RMD160 60931e9e47be99fb2ee2a0f5e7f117b3bd9ef1ad SHA1 8b7c9c70e88e192bc30c256c1ee205db91fb8729 SHA256 5f57d0bad25e2aff5285f62f6b736edb10f7b24c3f91c0eab39455c996327ad4
-MISC ChangeLog 821 RMD160 e0277018ac467b9290d7125308fd67363e601bb5 SHA1 2e4c748f81b11b48d0ff7bbcfa4905719ca0501f SHA256 fa41696f3e7ec5b6c094ea28e0a9d461dbe831beec77dd2448e141d5e9fe9075
+EBUILD vdr-console-0.6.0.ebuild 770 RMD160 5df042eb96835bdc5e39d6e0707851afc92a58ca SHA1 103ae90fa316c4c6480c3c5617f5c3985a6d56ad SHA256 90378cfc9ea2b69339ea744282cce6a1a52259bc189cbfb3c04443b5e226371a
+MISC ChangeLog 1109 RMD160 42560be0642540369fc4d1f263969b81d8290a45 SHA1 af432ae5204438e859d6559fa490cf2b860da755 SHA256 1d445796e5d9e818daf312d449630056b22c68027318aa8fa876b48c6ab4bd73
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFIcPz+dn07HTTCgIoRAh0UAKCDc8b76DP19t6U+qw8RBi2nXJVswCgnN1e
+EVSg5xH1gZvLu26CWZuIPcE=
+=SX0Y
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff
new file mode 100644
index 000000000000..35aac3e0e263
--- /dev/null
+++ b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff
@@ -0,0 +1,79 @@
+http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch?op=file&rev=0&sc=0
+
+by Tobias Grimm <tg@e-tobi.net>
+--- 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);
+
diff --git a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
index 7ebf8ae938a8..9c48bc019202 100644
--- a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
+++ b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 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-console/vdr-console-0.6.0.ebuild,v 1.3 2006/12/03 14:33:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/vdr-console-0.6.0.ebuild,v 1.4 2008/07/06 17:12:19 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -18,3 +18,12 @@ DEPEND=">=media-video/vdr-1.3.36"
 
 PATCHES="${FILESDIR}/${P}-vdr-1.3.18.diff
 	${FILESDIR}/${P}-uint64.diff"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	if has_version ">=media-video/vdr-1.5.8" ; then
+		ewarn "plugin will not support the new fonthandling"
+		epatch "${FILESDIR}/${P}-vdr-1.6.x-compilefix.diff"
+	fi
+}