cleanup

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

7 files changed, 11 insertions, 180 deletions

diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog
index 882e1341d2e4..65db4f1d8bb4 100644
--- a/media-plugins/vdr-ffnetdev/ChangeLog
+++ b/media-plugins/vdr-ffnetdev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-ffnetdev
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.18 2012/10/31 18:44:08 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.19 2014/01/08 12:40:03 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-ffnetdev-0.1.0-r1.ebuild,
+  -files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff,
+  -files/vdr-ffnetdev-0.1.0-buffer-overflow.diff,
+  -files/vdr-ffnetdev-0.1.0-gcc4.3.patch,
+  -files/vdr-ffnetdev-0.1.0-uint64.diff,
+  -files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff:
+  cleanup
 
 *vdr-ffnetdev-0.1.2 (31 Oct 2012)
 
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
deleted file mode 100644
index a62d3ee914d9..000000000000
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-fix compile Problems if you VDR compiled with bigpatch
-
-Joerg Bornkessel <hd_brummy@gentoo.org> (06 May 2006)
-
-diff -Naur vdr-ffnetdev-0.1.0.orig/ffnetdev.c vdr-ffnetdev-0.1.0/ffnetdev.c
---- vdr-ffnetdev-0.1.0.orig/ffnetdev.c	2006-05-06 21:00:39.433264204 +0000
-+++ vdr-ffnetdev-0.1.0/ffnetdev.c	2006-05-06 21:02:31.248100382 +0000
-@@ -127,8 +127,12 @@
-   return true;
- }
- 
--bool cPluginFFNetDev::Active(void) {
--	return (cOSDWorker::Active() || cTSWorker::Active());
-+cString cPluginFFNetDev::Active(void) {
-+	if(cOSDWorker::Active() || cTSWorker::Active())
-+		{
-+			return NULL;
-+		}
-+	return NULL;
- }
- 
- bool cPluginFFNetDev::Start(void)
-diff -Naur vdr-ffnetdev-0.1.0.orig/ffnetdev.h vdr-ffnetdev-0.1.0/ffnetdev.h
---- vdr-ffnetdev-0.1.0.orig/ffnetdev.h	2006-05-06 21:00:39.437264878 +0000
-+++ vdr-ffnetdev-0.1.0/ffnetdev.h	2006-05-06 21:01:09.062255117 +0000
-@@ -40,7 +40,7 @@
-   virtual cOsdObject *MainMenuAction(void);
-   virtual cMenuSetupPage *SetupMenu(void);
-   virtual bool SetupParse(const char *Name, const char *Value);
--  virtual bool Active(void);
-+  virtual cString Active(void);
-   
-   void SetPrimaryDevice();
-   void RestorePrimaryDevice();
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff
deleted file mode 100644
index 667fa5feaa88..000000000000
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-<<<<<<<<<<<<<<<<<< vdr-ffnetdev-0.1.0-buffer-overflow.diff >>>>>>>>>>>>>
-fix buffer overflow
-https://bugs.gentoo.org/show_bug.cgi?id=350999
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
-
-diff -Naur vdr-ffnetdev-0.1.0.orig/osdworker.c vdr-ffnetdev-0.1.0/osdworker.c
---- vdr-ffnetdev-0.1.0.orig/osdworker.c	2011-01-16 22:58:55.000000000 +0100
-+++ vdr-ffnetdev-0.1.0/osdworker.c	2011-01-16 23:00:15.000000000 +0100
-@@ -721,9 +721,9 @@
- 						    break;
- 						}
- 						
--					 	CARD8 name[7];
--					 	strcpy((char*)&name, "VDR-OSD");
--					 	if (!m_OSDClient->SafeWrite(&name, 7))
-+//					 	CARD8 name[7];
-+//					 	strcpy((char*)&name, "VDR-OSD");
-+					 	if (!m_OSDClient->SafeWrite("VDR-OSD", 7))
- 						{   
- 						    state = NO_CLIENT;
- 						    break;
-<<<<<<<<<<<<<<<<<< vdr-ffnetdev-0.1.0-buffer-overflow.diff >>>>>>>>>>>>>
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch
deleted file mode 100644
index 0c8825e4ee94..000000000000
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru vdr-ffnetdev-0.1.0-orig/netosd.h vdr-ffnetdev-0.1.0/netosd.h
---- vdr-ffnetdev-0.1.0-orig/netosd.h	2008-12-17 15:46:49.194277519 +0100
-+++ vdr-ffnetdev-0.1.0/netosd.h	2008-12-17 15:47:46.807603142 +0100
-@@ -17,7 +17,7 @@
- 	bool truecolor;
- protected:
- public:
--    cNetOSD(int XOfs, int XOfs);
-+    cNetOSD(int Left, int Top);
-     virtual ~cNetOSD();
-     virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-     virtual void Flush(void);
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-uint64.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-uint64.diff
deleted file mode 100644
index 5a9fa326aaab..000000000000
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-uint64.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru vdr-ffnetdev-0.1.0-orig/remote.c vdr-ffnetdev-0.1.0/remote.c
---- vdr-ffnetdev-0.1.0-orig/remote.c	2007-06-24 14:50:34.525838339 +0200
-+++ vdr-ffnetdev-0.1.0/remote.c	2007-06-24 14:50:55.027619351 +0200
-@@ -27,7 +27,7 @@
- 	return true;
- }
- 
--bool cMyRemote::Put(uint64 Code, bool Repeat, bool Release)
-+bool cMyRemote::Put(uint64_t Code, bool Repeat, bool Release)
- {
- 	return cRemote::Put(Code, Repeat ,Release);
- }
-diff -ru vdr-ffnetdev-0.1.0-orig/remote.h vdr-ffnetdev-0.1.0/remote.h
---- vdr-ffnetdev-0.1.0-orig/remote.h	2007-06-24 14:50:34.525838339 +0200
-+++ vdr-ffnetdev-0.1.0/remote.h	2007-06-24 14:50:45.526795335 +0200
-@@ -17,7 +17,7 @@
-   cMyRemote(const char *Name);
-   virtual bool Initialize(void);
-   virtual bool Ready(void);
--  virtual bool Put(uint64 Code, bool Repeat = false, bool Release = false);
-+  virtual bool Put(uint64_t Code, bool Repeat = false, bool Release = false);
- };
- 
- 
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff
deleted file mode 100644
index 9c9bb957575a..000000000000
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru --exclude=po vdr-ffnetdev-0.1.0-orig/ffnetdev.c vdr-ffnetdev-0.1.0/ffnetdev.c
---- vdr-ffnetdev-0.1.0-orig/ffnetdev.c	2008-04-07 21:23:41.111987897 +0200
-+++ vdr-ffnetdev-0.1.0/ffnetdev.c	2008-04-07 21:25:20.431993162 +0200
-@@ -32,10 +32,10 @@
- 	
- }
- 
--cOsd * cNetOSDProvider::CreateOsd(int Left, int Top)
-+cOsd * cNetOSDProvider::CreateOsd(int Left, int Top, uint level)
- {
-     
--    osd = new cNetOSD(Left, Top);
-+    osd = new cNetOSD(Left, Top, level);
-     return osd;
- }
- 
-Nur in vdr-ffnetdev-0.1.0: libvdr-ffnetdev.so.1.6.0.
-diff -ru --exclude=po vdr-ffnetdev-0.1.0-orig/netosd.c vdr-ffnetdev-0.1.0/netosd.c
---- vdr-ffnetdev-0.1.0-orig/netosd.c	2008-04-07 21:23:41.111987897 +0200
-+++ vdr-ffnetdev-0.1.0/netosd.c	2008-04-07 21:24:58.971993422 +0200
-@@ -9,7 +9,7 @@
- #include "osdworker.h"
- 
- //////////////////////////////////////////////////////////////////////////////////////////////////
--cNetOSD::cNetOSD(int Left, int Top) : cOsd(Left, Top)
-+cNetOSD::cNetOSD(int Left, int Top, uint level) : cOsd(Left, Top, level)
- {
- #ifdef DEBUG   
-    fprintf(stderr,"[ffnetdev] NetOSD: Constructor cNetOSD.\n");
-diff -ru --exclude=po vdr-ffnetdev-0.1.0-orig/netosd.h vdr-ffnetdev-0.1.0/netosd.h
---- vdr-ffnetdev-0.1.0-orig/netosd.h	2008-04-07 21:23:41.111987897 +0200
-+++ vdr-ffnetdev-0.1.0/netosd.h	2008-04-07 21:25:05.401989955 +0200
-@@ -17,7 +17,7 @@
- 	bool truecolor;
- protected:
- public:
--    cNetOSD(int Left, int Top);
-+    cNetOSD(int Left, int Top, uint level);
-     virtual ~cNetOSD();
-     virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-     virtual void Flush(void);
-@@ -31,7 +31,7 @@
-     cNetOSD **NetOSD;
- public:
-     cNetOSDProvider(void);
--    virtual cOsd *CreateOsd(int Left, int Top);
-+    virtual cOsd *CreateOsd(int Left, int Top, uint level);
- };
- 
- #endif //_NETOSD__H
diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild
deleted file mode 100644
index 5aa081d4cd41..000000000000
--- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild,v 1.4 2011/10/07 18:33:14 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: Output device which offers OSD via VNC and Video as raw mpeg over network"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-ffnetdev"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${P}
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	epatch "${FILESDIR}/${P}-uint64.diff"
-	epatch "${FILESDIR}/${P}-gcc4.3.patch"
-
-	if grep -q "virtual cString Active" /usr/include/vdr/plugin.h; then
-		epatch "${FILESDIR}/${P}-bigpatch-headers.diff"
-	fi
-
-		epatch "${FILESDIR}/${P}-vdr-1.6.0.diff"
-		epatch "${FILESDIR}/${P}-buffer-overflow.diff"
-}