reinit the tree, so we can have metadata

6 files changed, 202 insertions, 0 deletions

diff --git a/media-plugins/vdr-console/Manifest b/media-plugins/vdr-console/Manifest
new file mode 100644
index 000000000000..17cb828abcbf
--- /dev/null
+++ b/media-plugins/vdr-console/Manifest
@@ -0,0 +1,8 @@
+AUX vdr-console-0.6.0-uint64.diff 1140 SHA256 bc2bcdcb5ec45cbfbe848d9063f411934ce17817ca76674c667f45b19903af99 SHA512 e47e7290d03d1b95b69966945ce7d98b6ab1674ed639130d26d7187eb6ae89b3a6cecd0b82136302d96d1b876017c4301022cb4c29c6e5733bff84a1676ba44c WHIRLPOOL b1493b914d94538008d7295e1f573a3798a1cbc99246bc60e9b794313944b08becbc9469874cc0a30324d0014729abdd33da9a4532a547e6e70b650af73ac8ff
+AUX vdr-console-0.6.0-vdr-1.3.18.diff 1784 SHA256 fb8e2a6e0c9a06ad0f6fc803403f21178298f561950d22dcd1a2ea9dad2b135a SHA512 8aa6a54af1716da0813c64bc51feb31dda26f6d9b2d7245fb0b5c3adae01007ccf3dd9ff7ed4cf004cfe95bcf1f952595c16321d773a52eb889b59ae4f13ec4e WHIRLPOOL df3bba1597acaad3d90ecffc0ca4ed8246937aec1e98746db4689c3ccef63e926041e873e45a1181925084ee579f43af7ba4a63da0d8c2e79dad325f7191241f
+AUX vdr-console-0.6.0-vdr-1.6.x-compilefix.diff 2096 SHA256 a41ae9aa7ae68375ca11d1edecd7fd1997e1f59bb5246b1b4a96bc9926160d3f SHA512 9eac8aae3e63758d7963afb03881929ce45f21135679bebecbd42ab334931e91a25ca1e45ba0e98b2e6dd079c3f6f4ab9306eed185cc93e550c42fba7b9428ec WHIRLPOOL f9e43f8bccfe8fab0f31df1b2183df683a38a5e397f7c2556697f19956a8985f453ca64b54507482f6ed35ff6ee1434696ceb2d6ff4ac8079c6aae1b62e0b571
+DIST vdr-console-0.6.0.tgz 47133 SHA256 34809cb7df4728b15dca1de10e66d8cafb12f1d175a8f929b8da273a62e36261 SHA512 40d9819c68f4c17e62489f201ddc08514c7df898c9f99e20d733bba0e16c15f88613de51ddf27e7b9e440fba5f8186ba143936d4fdd26536c812d365a0a7e7d1 WHIRLPOOL d396b2686206deb60226530808914fbd1ec62f1b2067b5b0d541e7091198748ed2f11eab0ce09fa8f080e5b1e993cf23264f670c9b6eb11557294493badb8a4b
+EBUILD vdr-console-0.6.0.ebuild 777 SHA256 0a6388abe67d622d8437512b4c3a93c400c55653afc77b12cc85d37ef19005c2 SHA512 19093ca4e4746b963a8f424c40e233b8b933c3856b9eaa66708b884bec9863ccb4f20d36e53db8b01092aff3f6bf8ace5a0e1a2a250a599ac8407bc78ba6bcb4 WHIRLPOOL 5e7c39fc092c8fe55f446760c686d23fba8c19bd3e2a616c4af835e920842a5e8a63c92debf8775664a9bd6b0e5dbb664230025c78e65b783d20e9e5869118f0
+MISC ChangeLog 2749 SHA256 974065bb5c96638097b11dc45da007fa71bcad01049da498a9054d1b1d32fa4e SHA512 46824b21130413b93b613597c0c5dd315d250576b76783896f701b1b44e92e3108d9b6af137f612053e9ad240bc9767635afbe32b04963581a2c6414cd7e389d WHIRLPOOL aca6e963a07b8f5d5793388e0f8ab2d7d9fd09bdfb86f202aaa1f423da849be343717f8421bfad154a4a774c325d8a61a0f07453475b9157b246388c6d3a5645
+MISC ChangeLog-2015 1470 SHA256 f39353b02a32f455741a74e47b6cd292fb24e9df1286c906b6dce04ef5cfccb1 SHA512 6ede371bb8ec01638bc4d45da911533fee528a1faa73750fa5d4f8b05258557dbf68503ce20501f817b259c9696321058c327a83cf30db1a0889886f3bac8eb9 WHIRLPOOL 4a93054cd2a855c31b5cb8a2eb20fd6de47ab10ca3b39821874d427c2f156481c06b246b9f1babafc3f202dd97f5365ef22ebf8eb2c8887736e871a54b7a7aa3
+MISC metadata.xml 249 SHA256 d3b08f4769529a48cdedb9decab34312707ed6d65d2577d079e3f4cd953d545a SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3 WHIRLPOOL 594ba2bdfe29531c638cc624a9e7690bf0c6dfb38b76fa26f1a1fc341a8c1c48a8777a40a63473289746d318f1e363c26a627784cef2241c10e75f023f43dc1a
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
new file mode 100644
index 000000000000..922fce25cb64
--- /dev/null
+++ b/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
@@ -0,0 +1,33 @@
+diff -ru console-0.6.0-orig/menu.c console-0.6.0/menu.c
+--- console-0.6.0-orig/menu.c	2006-12-03 15:28:31.522732562 +0100
++++ console-0.6.0/menu.c	2006-12-03 15:29:04.026492765 +0100
+@@ -1193,7 +1193,7 @@
+ 
+     switch (BASICKEY(Key)) {
+ 
+-    case kKbd:{     uint64 buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
++    case kKbd:{     uint64_t buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
+                     WriteToConsole(buf);
+ 
+                     // On every key press, we show the cursor immediately
+@@ -1425,7 +1425,7 @@
+ 
+ 
+ 
+-void cMenuConsole::WriteToConsole(const uint64& code) {
++void cMenuConsole::WriteToConsole(const uint64_t& code) {
+ 
+   unsigned char* data = (unsigned char*)(void*)&code;
+ 
+diff -ru console-0.6.0-orig/menu.h console-0.6.0/menu.h
+--- console-0.6.0-orig/menu.h	2006-12-03 15:28:31.526733517 +0100
++++ console-0.6.0/menu.h	2006-12-03 15:28:44.925932704 +0100
+@@ -102,7 +102,7 @@
+ private:
+   void CaptureKeyboard();
+   void ReleaseKeyboard();
+-  void WriteToConsole(const uint64& code);
++  void WriteToConsole(const uint64_t& code);
+   bool TerminateConsole();
+ 
+   void AddSubMenu(cOsdObject* pSubMenu);
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff
new file mode 100644
index 000000000000..9f0af3489aaf
--- /dev/null
+++ b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff
@@ -0,0 +1,43 @@
+diff -Nru console-0.6.0-original/menu.c console-0.6.0/menu.c
+--- console-0.6.0-original/menu.c	2004-09-12 00:10:57.000000000 +0200
++++ console-0.6.0/menu.c	2005-01-15 11:59:07.735539136 +0100
+@@ -1210,14 +1210,14 @@
+     }
+     case kNone:
+                     // Handle blinking elements
+-                    if (time_ms() >= _nextBlinkTime) {
++                    if ((int)cTimeMs::Now() >= _nextBlinkTime) {
+ 
+-                      _nextBlinkTime = time_ms() + config.BlinkRate * 100;
++                      _nextBlinkTime = cTimeMs::Now() + config.BlinkRate * 100;
+                       _blink = !_blink;
+                     }
+ 
+                     // Handle keyboard releaseing
+-                    if (time_ms() >= _timeReleaseCapture) {
++                    if ((int)cTimeMs::Now() >= _timeReleaseCapture) {
+                       _timeReleaseCapture = INT_MAX;
+ 
+                       // Time elapsed -> repost ESC...
+@@ -1243,10 +1243,10 @@
+                       _pConsole->getScreen().BellSeen();
+ 
+                       if (config.BellTimeout) {
+-                        _toRing = time_ms() + config.BellTimeout * 1000;
++                        _toRing = cTimeMs::Now() + config.BellTimeout * 1000;
+                         state = osUser1;
+                       }
+-                    } else if (_toRing && time_ms() > _toRing) {
++                    } else if (_toRing && (int)cTimeMs::Now() > _toRing) {
+                       _toRing = 0;
+                       state = osUser1;
+                     }
+@@ -1441,7 +1441,7 @@
+           // esc detected. Ask for exit
+           if (data[i] == ESC) {
+ 
+-            _timeReleaseCapture = time_ms() + 1000;
++            _timeReleaseCapture = cTimeMs::Now() + 1000;
+             _inputState = 1;
+ 
+           } else
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/metadata.xml b/media-plugins/vdr-console/metadata.xml
new file mode 100644
index 000000000000..984a01fab265
--- /dev/null
+++ b/media-plugins/vdr-console/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
new file mode 100644
index 000000000000..f42b4815802e
--- /dev/null
+++ b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="vdr Plugin: Shows linux console on vdr's output device"
+HOMEPAGE="http://ricomp.de/vdr/"
+SRC_URI="http://ricomp.de/vdr/${P}.tgz"
+
+LICENSE="GPL-2"
+IUSE=""
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-vdr-1.3.18.diff
+	"${FILESDIR}"/${P}-uint64.diff )
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	vdr_remove_i18n_include console.c menu.c terminalemulation.c virtualconsole.c virtualconsoles.c
+	sed  -i console.c -e "s:RegisterI18n://RegisterI18n:"
+
+	ewarn "plugin will not support the new fonthandling"
+	epatch "${FILESDIR}/${P}-vdr-1.6.x-compilefix.diff"
+}