compile fix gcc-4.6; message overran fixed bug #363721

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 61 insertions, 12 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index 1a6ebb568842..7c89eb13e5f0 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-vompserver
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.15 2010/12/01 22:52:56 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.16 2012/03/31 10:18:22 hd_brummy Exp $
+
+*vdr-vompserver-0.3.1-r1 (31 Mar 2012)
+
+  31 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-vompserver-0.3.0.ebuild, vdr-vompserver-0.3.1.ebuild,
+  +vdr-vompserver-0.3.1-r1.ebuild, +files/rrprocstart.patch:
+  compile fix gcc-4.6; message overran fixed bug #363721
 
   01 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-vompserver-0.3.0.ebuild:
diff --git a/media-plugins/vdr-vompserver/files/rrprocstart.patch b/media-plugins/vdr-vompserver/files/rrprocstart.patch
new file mode 100644
index 000000000000..bccdc9d5700d
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/rrprocstart.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-rrprocstart.dpatch by  <marten.richter@freenet.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of a bug in rrproc
+
+fix a message overrun when MediaMVP boots
+The topic is documented in http://forum.loggytronic.com/index.php?topic=528.0
+
+@DPATCH@
+diff -u vdr-plugin-vompserver-new/vompclientrrproc.c vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
+--- vdr-plugin-vompserver-new/vompclientrrproc.c	2010-07-05 19:20:11.000000000 +0200
++++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c	2010-07-05 19:24:05.000000000 +0200
+@@ -87,9 +87,25 @@
+ 
+   if (req_queue.size() != 0)
+   {
+-    log->log("RRProc", Log::ERR, "threadMethod err 1");     
+-    threadUnlock();
+-    return;
++    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets");     
++    while (req_queue.size()) 
++    {
++      //log->log("RRProc", Log::DEBUG, "thread while");
++      req = req_queue.front();
++      req_queue.pop();
++      
++      threadUnlock(); // allow recvRequest to be queuing packets while we are working on this one
++      
++      if (!processPacket())
++      {
++        log->log("RRProc", Log::ERR, "processPacket exited with fail");     
++        return;
++      }
++      
++      threadLock();
++    } 
++    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets done.");     
++
+   }
+     
+   while(1)
+
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
index cb733877666a..ef8ba67a876d 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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.3.0.ebuild,v 1.3 2010/12/01 22:52:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild,v 1.1 2012/03/31 10:18:22 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -18,12 +18,13 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.2.6"
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${P}_vdr-1.7.3-compile.diff"
+PATCHES=("${FILESDIR}/rrprocstart.patch")
 
 src_prepare() {
 	vdr-plugin_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
+	sed -i "s:char b:// char b:" mediafile.c
 }
 
 src_install() {
@@ -45,7 +46,4 @@ pkg_postinst() {
 	elog "You have to download the dongle file (i.e. firmware) and adapt"
 	elog "the vomp configuration files accordingly."
 	echo
-
-	elog "Please edit up from version ${PN}-0.2.6"
-	elog "all config files in /etc/vdr/plugins/vomp/"
 }
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
index a6d6b09670fe..d7497e5c03c6 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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.3.1.ebuild,v 1.1 2010/12/01 20:53:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild,v 1.2 2012/03/31 10:18:22 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -22,6 +22,7 @@ src_prepare() {
 	vdr-plugin_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
+	sed -i "s:char b:// char b:" mediafile.c
 }
 
 src_install() {