clean up; stable x86 amd64, wrt bug 495784

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

6 files changed, 14 insertions, 137 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index f6b72b271f41..a1a698815edf 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-vompserver
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.20 2013/03/31 16:28:07 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.21 2014/01/02 12:19:16 hd_brummy Exp $
+
+  02 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-vompserver-0.2.6-gentoo.diff,
+  -files/vdr-vompserver-0.2.6-vdr-1.5.0.diff,
+  -files/vdr-vompserver-0.2.7-gentoo.diff,
+  -files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff,
+  vdr-vompserver-0.4.0.ebuild:
+  clean up; stable x86 amd64, wrt bug 495784
 
 *vdr-vompserver-0.4.0 (31 Mar 2013)
 
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-gentoo.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-gentoo.diff
deleted file mode 100644
index 39f71c91db00..000000000000
--- a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-gentoo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-change config Path for more overview if you have a lot plugins installed
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 17 Feb 2007
-
-diff -Naur vompserver-0.2.6.orig/bootpd.c vompserver-0.2.6/bootpd.c
---- vompserver-0.2.6.orig/bootpd.c	2007-02-17 18:25:39.300235973 +0100
-+++ vompserver-0.2.6/bootpd.c	2007-02-17 18:26:03.418578373 +0100
-@@ -99,7 +99,7 @@
- 
-   // Open a config file for the given MAC
- 
--  const char* configDir = cPlugin::ConfigDirectory();
-+  const char* configDir = cPlugin::ConfigDirectory( "vomp" );
- //  char* configDir = "/opt/dvb/vdr-config-1.3/plugins";
-   if (!configDir)
-   {
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff
deleted file mode 100644
index 9417bc327f2b..000000000000
--- a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN vompserver-1.4/mvpreceiver.c vompserver-1.5/mvpreceiver.c
---- vompserver-1.4/mvpreceiver.c        2006-03-01 22:29:01.000000000 +0000
-+++ vompserver-1.5/mvpreceiver.c        2007-01-16 18:53:27.000000000 +0000
-@@ -25,8 +25,10 @@
- MVPReceiver::MVPReceiver(cChannel* channel, cDevice* device)
- #if VDRVERSNUM < 10300
- : cReceiver(channel->Ca(), 0, 7, channel->Vpid(), channel->Ppid(), channel->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2(), channel->Tpid())
--#else
-+#elif VDRVERSNUM < 10500
- : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())
-+#else
-+: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())
- #endif
- {
-   logger = Log::getInstance();
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff
deleted file mode 100644
index 673767bf05c8..000000000000
--- a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-change config Path for more overview if you have a lot plugins installed
-Update: place vonp.conf into vomp plugin subdir also
-
-Petric Frank <pfrank@gmx.de> 28 Dec 2007
-
-based on vdr-vompsever-0.2.6-gentoo.diff from Joerg Bornkessel <hd_brummy@gentoo.org> 17 Feb 2007
-
-diff -Naur vompserver-0.2.7.old/bootpd.c vompserver-0.2.7/bootpd.c
---- vompserver-0.2.7.old/bootpd.c	2007-11-05 22:05:30.000000000 +0100
-+++ vompserver-0.2.7/bootpd.c	2007-12-28 01:54:44.000000000 +0100
-@@ -99,7 +99,7 @@
- 
-   // Open a config file for the given MAC
- 
--  const char* configDir = cPlugin::ConfigDirectory();
-+  const char* configDir = cPlugin::ConfigDirectory( "vomp" );
- //  char* configDir = "/opt/dvb/vdr-config-1.3/plugins";
-   if (!configDir)
-   {
-diff -Naur vompserver-0.2.7.old/vompserver.c vompserver-0.2.7/vompserver.c
---- vompserver-0.2.7.old/vompserver.c	2007-11-07 21:28:28.000000000 +0100
-+++ vompserver-0.2.7/vompserver.c	2007-12-28 02:15:22.000000000 +0100
-@@ -27,6 +27,8 @@
- static const char *VERSION        = "0.2.7";
- static const char *DESCRIPTION    = "VDR on MVP plugin by Chris Tallon";
- 
-+static char *PLUGIN_CONFIG_SUBDIR = "vomp";
-+
- class cPluginVompserver : public cPlugin
- {
- public:
-@@ -61,7 +63,7 @@
- bool cPluginVompserver::Start(void)
- {
-   // Start any background activities the plugin shall perform.
--  int success = mvpserver.run(configDir);
-+  int success = mvpserver.run(configDir ? configDir : PLUGIN_CONFIG_SUBDIR);
-   if (success) return true;
-   else return false;
- }
-
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff
deleted file mode 100644
index cba6275939e1..000000000000
--- a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-compile fix for >=vdr-1..3
-suggested by T.Ghuenter
-Joerg Bornkessel <hd_brummy@gento.org> 07 May 2009
-diff -Naur vompserver-0.3.0.orig/recplayer.c vompserver-0.3.0/recplayer.c
---- vompserver-0.3.0.orig/recplayer.c	2009-05-07 19:48:18.592438442 +0200
-+++ vompserver-0.3.0/recplayer.c	2009-05-07 19:49:26.375764634 +0200
-@@ -34,7 +34,11 @@
- 
-   // FIXME find out max file path / name lengths
- 
-+#if VDRVERSNUM >= 10703
-+  indexFile = new cIndexFile(recording->FileName(), false, rec->IsPesRecording());
-+#else
-   indexFile = new cIndexFile(recording->FileName(), false);
-+#endif
-   if (!indexFile) log->log("RecPlayer", Log::ERR, "Failed to create indexfile!");
- 
-   scan();
-@@ -193,12 +197,19 @@
- {
-   if (!indexFile) return 0;
- 
-+#if VDRVERSNUM >= 10703
-+  uint16_t retFileNumber;
-+  off_t retFileOffset;
-+
-+  if (!indexFile->Get((int)frameNumber, &retFileNumber, &retFileOffset))
-+#else
-   uchar retFileNumber;
-   int retFileOffset;
-   uchar retPicType;
-   int retLength;
- 
-   if (!indexFile->Get((int)frameNumber, &retFileNumber, &retFileOffset, &retPicType, &retLength))
-+#endif
-   {
-     return 0;
-   }
-@@ -240,6 +251,12 @@
- 
-   if (!indexFile) return false;
- 
-+#if VDRVERSNUM >= 10703
-+  int iframeLength;
-+  int indexReturnFrameNumber;
-+
-+  indexReturnFrameNumber = (ULONG)indexFile->GetNextIFrame(frameNumber, (direction==1 ? true : false), NULL, NULL, &iframeLength);
-+#else
-   uchar waste1;
-   int waste2;
- 
-@@ -247,6 +264,7 @@
-   int indexReturnFrameNumber;
- 
-   indexReturnFrameNumber = (ULONG)indexFile->GetNextIFrame(frameNumber, (direction==1 ? true : false), &waste1, &waste2, &iframeLength);
-+#endif
-   log->log("RecPlayer", Log::DEBUG, "GNIF input framenumber:%lu, direction=%lu, output:framenumber=%i, framelength=%i", frameNumber, direction, indexReturnFrameNumber, iframeLength);
- 
-   if (indexReturnFrameNumber == -1) return false;
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild
index a66236255e0f..6d4f7da9946c 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild,v 1.1 2013/03/31 16:28:07 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild,v 1.2 2014/01/02 12:19:16 hd_brummy Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit vdr-plugin-2
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.36-r1"