diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff')
-rw-r--r-- | media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff | 79 |
1 files changed, 79 insertions, 0 deletions
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); + |