media-plugins/vdr-reelosdpip: moved from vdr-osdpip to vdr-reelosdpip, due conflikt with vdr-osdpip in main portage

svn path=/testing/; revision=587

6 files changed, 142 insertions, 0 deletions

diff --git a/media-plugins/vdr-reelosdpip/ChangeLog b/media-plugins/vdr-reelosdpip/ChangeLog
new file mode 100644
index 0000000..11b9ae6
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for media-plugins/vdr-reelosdpip
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  15 Jun 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-reelosdpip-0.1.12384.ebuild,
+  +files/vdr-reelosdpip-0.1.12384_include.diff,
+  +files/vdr-reelosdpip-0.1.12384.diff, +metadata.xml:
+  moved from vdr-osdpip to vdr-reelosdpip, due conflikt with vdr-osdpip in
+  main portage
+
diff --git a/media-plugins/vdr-reelosdpip/Manifest b/media-plugins/vdr-reelosdpip/Manifest
new file mode 100644
index 0000000..c6b3a71
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/Manifest
@@ -0,0 +1,6 @@
+AUX vdr-reelosdpip-0.1.12384.diff 2761 RMD160 23e2db2a0b65a7e37de547523ae2f916ee3a8ff0 SHA1 e8a27bd418071a1c2d00da3455a3d3fb5ea82c1c SHA256 3c9fd746423c42d4a3824b085cd40384810e4f31bcdf5c60cad5dc5a68358bd6
+AUX vdr-reelosdpip-0.1.12384_include.diff 370 RMD160 be439f25c857fbd57c507aab7791d54bd32567db SHA1 1fdf2c18624e9453c799a64d0b0b6836eb4a6ff2 SHA256 b37d3821c34ecb8ec20bf4738a56378a33585c8712eddc8f4f755db74671d8f4
+DIST vdr-reelosdpip-0.1.12384.tgz 16440 RMD160 c41d662e36af19efd7b5844de6f32e76d8493593 SHA1 ca84b4c82370a1b8622d57c6dbc7f4195b45d647 SHA256 9bd66fe357a307cf8493693bfe36c3b527a16ec74abde540f962630abd9c5cc1
+EBUILD vdr-reelosdpip-0.1.12384.ebuild 640 RMD160 9af4829347b551633b4862bb3e40938c3c158fac SHA1 ca079878a8e85cb9e1dfc5c958a87a1fb0874fed SHA256 b0763cde47545829cfe28f661a000f07b5042d6b3c987dacaad52bdbf63b803c
+MISC ChangeLog 414 RMD160 b55e8377e62bb5f92fc243e45baf567c952d95bb SHA1 dbc5d9f008a5e3b8b20bd343784a3ba2f9970a53 SHA256 f26edfe0a49d6de8be8977ac423ef526227b01bee9d4e7d04987adf2bb5f1598
+MISC metadata.xml 352 RMD160 57a3a02b1c7da27ff3277627eed5645a1812adcc SHA1 15007ef9f352900614d270f14e511414f2669576 SHA256 54b2ad3aff6816a964885c849410e0e67777000713e98b776217b7d509ba0ad2
diff --git a/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384.diff b/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384.diff
new file mode 100644
index 0000000..80fe038
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384.diff
@@ -0,0 +1,66 @@
+diff -Nru vdr-osdpip.org/osd.c vdr-osdpip/osd.c
+--- vdr-osdpip.org/osd.c	2008-12-25 07:50:50.000000000 +0100
++++ vdr-osdpip/osd.c	2008-12-25 10:36:44.000000000 +0100
+@@ -65,7 +65,7 @@
+     const cChannel *chan = cDevice::CurrentChannel() != 0 ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
+     if (chan) {
+         Channels.SwitchTo(m_Channel->Number());
+-        cDevice *dev = cDevice::GetDevice(chan, 1);
++        cDevice *dev = cDevice::GetDevice(chan, 1,true);
+         if (dev) {
+             DELETENULL(m_Receiver);
+             m_Channel = chan;
+@@ -97,7 +97,7 @@
+             // try only channels which are currently available
+             bool ndr = false;
+             dev = cDevice::GetDevice(channel, 0, &ndr);
+-            if (dev && !ndr && !cStatus::MsgChannelProtected(0, channel))       // PIN PATCH
++            if (dev && !ndr )       // PIN PATCH
+                 break;
+             n = channel->Number() + Direction;
+         }
+@@ -129,7 +129,7 @@
+ {
+     const cChannel *chan = cDevice::CurrentChannel() != 0 ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
+     if (chan) {
+-        cDevice *dev = cDevice::GetDevice(chan, 1);
++        cDevice *dev = cDevice::GetDevice(chan, 1,true);
+         if (dev) {
+             DELETENULL(m_Receiver);
+             m_Channel = chan;
+diff -Nru vdr-osdpip.org/osdpip.c vdr-osdpip/osdpip.c
+--- vdr-osdpip.org/osdpip.c	2008-12-25 07:50:50.000000000 +0100
++++ vdr-osdpip/osdpip.c	2008-12-25 10:33:55.000000000 +0100
+@@ -118,7 +118,7 @@
+             ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
+     if (chan != NULL)
+     {
+-        dev = cDevice::GetDevice(chan, 1);
++        dev = cDevice::GetDevice(chan, 1, true);
+         if (dev)
+         {
+             printf
+diff -Nru vdr-osdpip.org/receiver.c vdr-osdpip/receiver.c
+--- vdr-osdpip.org/receiver.c	2008-12-25 07:50:50.000000000 +0100
++++ vdr-osdpip/receiver.c	2008-12-25 10:55:21.000000000 +0100
+@@ -15,7 +15,7 @@
+ 
+ cOsdPipReceiver::cOsdPipReceiver(const cChannel * Channel,
+                                  cPipPlayer * pipplayer):
+-cReceiver(Channel->Ca(), 0, Channel->Vpid()),
++cReceiver(Channel->GetChannelID(), 0, Channel->Vpid(),0,0,0),
+ player(pipplayer)
+ {
+     //printf("cOsdPipReceiver::cOsdPipReceiver\n");
+diff -Nru vdr-osdpip.org/osd.c vdr-osdpip/osd.c
+--- vdr-osdpip.org/osd.c	2008-12-29 16:11:03.000000000 +0100
++++ vdr-osdpip/osd.c	2008-12-29 16:11:41.000000000 +0100
+@@ -175,7 +175,7 @@
+     if (state == osUnknown) {
+         switch (Key & ~k_Repeat)
+         {
+-        case kGreater:
++        case kRight:
+             if (OsdPipSetup.PipPosition == kInfoTopLeft)
+                 OsdPipSetup.PipPosition = kInfoTopRight;
+             else if (OsdPipSetup.PipPosition == kInfoBottomLeft)
diff --git a/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384_include.diff b/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384_include.diff
new file mode 100644
index 0000000..39428a0
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/files/vdr-reelosdpip-0.1.12384_include.diff
@@ -0,0 +1,13 @@
+--- osd.c.org	2009-03-27 17:27:09.000000000 +0100
++++ osd.c	2009-03-27 17:27:25.000000000 +0100
+@@ -8,8 +8,8 @@
+ #include "receiver.h"
+ #include "setup.h"
+ 
+-#include "../filebrowser/servicestructs.h"
+-#include "../filebrowser/stillpictureplayer.h"
++#include <reel-filebrowser/servicestructs.h>
++#include <reel-filebrowser/stillpictureplayer.h>
+ 
+ #include <iostream>
+ 
diff --git a/media-plugins/vdr-reelosdpip/metadata.xml b/media-plugins/vdr-reelosdpip/metadata.xml
new file mode 100644
index 0000000..83928e6
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-tv</herd>
+	<maintainer>
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
+	<maintainer>
+		<email>joerg_pb@gmx.net</email>
+		<name>Joerg Krause</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/media-plugins/vdr-reelosdpip/vdr-reelosdpip-0.1.12384.ebuild b/media-plugins/vdr-reelosdpip/vdr-reelosdpip-0.1.12384.ebuild
new file mode 100644
index 0000000..697ca2f
--- /dev/null
+++ b/media-plugins/vdr-reelosdpip/vdr-reelosdpip-0.1.12384.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR Plugin: for the Reel true color osd"
+HOMEPAGE="http://www.reel-multimedia.com"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+DEPEND=">=media-video/vdr-1.6.0
+		>=media-video/reelbox-ehd-headers-12384"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	epatch "${FILESDIR}/${P}.diff"
+	epatch "${FILESDIR}/${P}_include.diff"
+
+	sed -e "s:osdpip:reelosdpip:" -i Makefile
+}
+