summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-plugins/vdr-console/Manifest1
-rw-r--r--media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff33
-rw-r--r--media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff43
-rw-r--r--media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff79
-rw-r--r--media-plugins/vdr-console/metadata.xml8
-rw-r--r--media-plugins/vdr-console/vdr-console-0.6.0.ebuild31
6 files changed, 0 insertions, 195 deletions
diff --git a/media-plugins/vdr-console/Manifest b/media-plugins/vdr-console/Manifest
deleted file mode 100644
index ea2cff26999..00000000000
--- a/media-plugins/vdr-console/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-console-0.6.0.tgz 47133 BLAKE2B 2ed87ab6f9a5f63d959aa3a6c2fbc637fe69ddce1200c381a8a439db8efa63dc896ad4e41a8b5c79164e6176a28a5b387cf1c83460f856abd9407f99039bb4be SHA512 40d9819c68f4c17e62489f201ddc08514c7df898c9f99e20d733bba0e16c15f88613de51ddf27e7b9e440fba5f8186ba143936d4fdd26536c812d365a0a7e7d1
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
deleted file mode 100644
index 922fce25cb6..00000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 9f0af3489aa..00000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 35aac3e0e26..00000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 984a01fab26..00000000000
--- a/media-plugins/vdr-console/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index dccf56c0c6f..00000000000
--- a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-
-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"
-}