cleanup; stable x86; version bump

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 0 insertions, 198 deletions

diff --git a/media-plugins/vdr-osdteletext/files/i18n_german_lang.diff b/media-plugins/vdr-osdteletext/files/i18n_german_lang.diff
deleted file mode 100644
index 9947fa35ea9f..000000000000
--- a/media-plugins/vdr-osdteletext/files/i18n_german_lang.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-will fix some errors in syslog for "no translation found for ...."
-
-hd_brummy@gentoo.org < Joerg Bornkessel> 04 Jul 2006 for German Translation
-
-diff -Naur osdteletext-0.5.1.orig/i18n.c osdteletext-0.5.1/i18n.c
---- osdteletext-0.5.1.orig/i18n.c	2006-07-04 15:48:13.175709500 +0200
-+++ osdteletext-0.5.1/i18n.c	2006-07-04 15:54:06.077764500 +0200
-@@ -441,5 +441,59 @@
-     "Visualitza el teletext en l'OSD",        //Catalan
-     "¿ÞÚÐ× âÕÛÕâÕÚáâÐ Ò ÜÕÝî",                //Russian
-   },
-+  { "Play",       //English
-+    "Abspielen",  //German
-+    "",           //Slovenian
-+    "",           //Italian
-+    "",           //Dutch
-+    "",           //Portuguese
-+    "",           //French
-+    "",           //Norwegian
-+    "",           //Finnish
-+    "",           //Polish
-+    "",           //Spanish
-+    "",           //Greek
-+    "",           //Swedish
-+    "",           //Romanian
-+    "",           //Hugarian
-+    "",           //Catalan
-+    "",           //Russian
-+  },
-+  { "FastFwd",    //English
-+    "Schneller Vorlauf",      //German
-+    "",           //Slovenian
-+    "",           //Italian
-+    "",           //Dutch
-+    "",           //Portuguese
-+    "",           //French
-+    "",           //Norwegian
-+    "",           //Finnish
-+    "",           //Polish
-+    "",           //Spanish
-+    "",           //Greek
-+    "",           //Swedish
-+    "",           //Romanian
-+    "",           //Hugarian
-+    "",           //Catalan
-+    "",           //Russian
-+  },
-+  { "FastRew",    //English
-+    "Schneller Rücklauf",      //German
-+    "",           //Slovenian
-+    "",           //Italian
-+    "",           //Dutch
-+    "",           //Portuguese
-+    "",           //French
-+    "",           //Norwegian
-+    "",           //Finnish
-+    "",           //Polish
-+    "",           //Spanish
-+    "",           //Greek
-+    "",           //Swedish
-+    "",           //Romanian
-+    "",           //Hugarian
-+    "",           //Catalan
-+    "",           //Russian
-+  },
-   { NULL }
-   };
diff --git a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff
deleted file mode 100644
index 183162258de1..000000000000
--- a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur osdteletext-0.5.1/osdteletext.c osdteletext-0.5.1-patched/osdteletext.c
---- osdteletext-0.5.1/osdteletext.c	2005-08-16 16:19:25.000000000 +0200
-+++ osdteletext-0.5.1-patched/osdteletext.c	2008-06-03 16:17:25.000000000 +0200
-@@ -113,7 +113,6 @@
-       delete txtStatus;
-    if (channelStatus)
-       delete channelStatus;
--   Storage::instance()->cleanUp();
- }
- 
- const char *cPluginTeletextosd::CommandLineHelp(void)
-diff -Nur osdteletext-0.5.1/txtrecv.c osdteletext-0.5.1-patched/txtrecv.c
---- osdteletext-0.5.1/txtrecv.c	2008-06-03 16:13:30.000000000 +0200
-+++ osdteletext-0.5.1-patched/txtrecv.c	2008-06-03 16:20:56.000000000 +0200
-@@ -526,7 +526,7 @@
- 
- void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber)
- {
--   if (Device->IsPrimaryDevice()) {
-+   if (Device->IsPrimaryDevice() || Device == cDevice::ActualDevice()) {
- 
- /*#ifdef OSDTELETEXT_REINSERTION_PATCH
-       if (ttSetup.suspendReceiving) {
-@@ -563,9 +563,9 @@
-       if (!channel)
-          return;
-       //primary device a full-featured card
--      if (cDevice::PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit)) {
-+      if (cDevice::ActualDevice()->ProvidesChannel(channel, Setup.PrimaryLimit)) {
-           receiver = new cTxtReceiver(TPid, chan);
--          cDevice::PrimaryDevice()->AttachReceiver(receiver);
-+          cDevice::ActualDevice()->AttachReceiver(receiver);
-           //dsyslog("OSDTeletext: Created teletext receiver for channel %d, PID %d on primary device", ChNum, TPid);
-       //primary device a DXR3 or similar
-       } else {
-@@ -699,6 +699,7 @@
- #else
-  : cReceiver(0, -1, 1, TPid), 
- #endif
-+cThread("osdteletext-receiver"),
-    chan(chan), TxtPage(0), buffer((188+60)*75), running(false)
- {
-    Storage::instance()->prepareDirectory(chan);
-@@ -709,7 +710,7 @@
- 
- cTxtReceiver::~cTxtReceiver()
- {
--   Detach();
-+   cReceiver::Detach();
-    if (running) {
-       running=false;
-       buffer.Signal();
-@@ -719,6 +720,12 @@
-    delete TxtPage;
- }
- 
-+void cTxtReceiver::Stop()
-+{
-+   Activate(false);
-+}
-+
-+
- void cTxtReceiver::Activate(bool On)
- {
-   if (On) {
-diff -Nur osdteletext-0.5.1/txtrecv.h osdteletext-0.5.1-patched/txtrecv.h
---- osdteletext-0.5.1/txtrecv.h	2005-08-12 13:20:14.000000000 +0200
-+++ osdteletext-0.5.1-patched/txtrecv.h	2008-06-03 16:21:56.000000000 +0200
-@@ -175,6 +175,7 @@
- public:
-    cTxtReceiver(int TPid, tChannelID chan);
-    virtual ~cTxtReceiver();
-+   virtual void Stop();
- };
- 
- class cTxtStatus : public cStatus/*, public cThread*/ {
diff --git a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch
deleted file mode 100644
index eef0fe66677c..000000000000
--- a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -aur osdteletext-0.5.1/Makefile osdteletext/Makefile
---- osdteletext-0.5.1/Makefile	2005-08-08 18:29:22.000000000 +0200
-+++ osdteletext/Makefile	2006-04-23 17:54:49.000000000 +0200
-@@ -20,7 +20,6 @@
- 
- ### The directory environment:
- 
--DVBDIR = ../../../../DVB
- VDRDIR = ../../..
- LIBDIR = ../../lib
- TMPDIR = /tmp
-@@ -32,6 +31,10 @@
- ### The version number of VDR (taken from VDR's "config.h"):
- 
- VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-+ifeq ($(strip $(APIVERSION)),)
-+  APIVERSION = $(VDRVERSION)
-+endif
- 
- ### The name of the distribution archive:
- 
-@@ -40,7 +43,7 @@
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
-+INCLUDES += -I$(VDRDIR)/include
- 
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE
- 
-@@ -72,7 +75,7 @@
- 
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
--	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-Nur in osdteletext: .svn.
-diff -aur osdteletext-0.5.1/txtrecv.c osdteletext/txtrecv.c
---- osdteletext-0.5.1/txtrecv.c	2005-08-12 13:20:09.000000000 +0200
-+++ osdteletext/txtrecv.c	2007-01-14 00:14:15.667936696 +0100
-@@ -692,7 +692,9 @@
- */
- 
- cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan)
--#if VDRVERSNUM >= 10319
-+#if VDRVERSNUM >= 10500
-+ : cReceiver(chan, -1, TPid), 
-+#elif VDRVERSNUM >= 10319
-  : cReceiver(0, -1, TPid), 
- #else
-  : cReceiver(0, -1, 1, TPid),