Added switch to set telnet port number to be able to use more than one instance at a time, Bug #200816.

(Portage version: 2.1.5)

3 files changed, 93 insertions, 1 deletions

diff --git a/media-tv/dvbstream/ChangeLog b/media-tv/dvbstream/ChangeLog
index e078ed0481d5..1a258b004bc8 100644
--- a/media-tv/dvbstream/ChangeLog
+++ b/media-tv/dvbstream/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/dvbstream
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/ChangeLog,v 1.7 2008/03/02 14:23:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/ChangeLog,v 1.8 2008/05/16 18:01:16 zzam Exp $
+
+*dvbstream-0.7_pre20080302-r1 (16 May 2008)
+
+  16 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/dvbstream-0.7_pre20080302-telnet-port-switch.diff,
+  +dvbstream-0.7_pre20080302-r1.ebuild:
+  Added switch to set telnet port number to be able to use more than one
+  instance at a time, Bug #200816.
 
 *dvbstream-0.7_pre20080302 (02 Mar 2008)
 
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080302-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080302-r1.ebuild
new file mode 100644
index 000000000000..6a6b97cb0552
--- /dev/null
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080302-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/dvbstream-0.7_pre20080302-r1.ebuild,v 1.1 2008/05/16 18:01:16 zzam Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="simple command line tools for DVB cards. Includes a RTP multicast stream server"
+HOMEPAGE="http://sourceforge.net/projects/dvbtools"
+
+#SRC_URI="mirror://sourceforge/dvbtools/${P}.tar.gz"
+MY_P=${PN}-snapshot-${PV##*_pre}
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND="dev-lang/perl"
+DEPEND="media-tv/linuxtv-dvb-headers"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-telnet-port-switch.diff"
+
+	cd "${S}"
+	sed -i Makefile \
+		-e 's:$(CFLAGS):$(CFLAGS) $(CPPFLAGS):' \
+		-e '/CFLAGS.*=.*-g -Wall -O2/s:-g -Wall -O2::' \
+		-e '/CFLAGS.*=/s:CFLAGS:CPPFLAGS:' \
+		-e 's:-I \.\./DVB/include:-I /usr/include:'
+
+	cp TELNET/svdrpsend.pl dvbstream-send.pl
+	cp TELNET/README README.telnet
+
+	sed -e 's:\./svdrpsend.pl:dvbstream-send.pl:' \
+		-i TELNET/*.sh
+
+	sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
+		-e 's:^TS2ES=.*$:TS2ES=ts2es:' \
+		-i *.sh
+}
+
+src_install() {
+	dobin dvbstream dumprtp rtpfeed ts_filter dvbstream-send.pl
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}/tune
+	doins TELNET/*.sh
+
+	insinto /usr/share/doc/${PF}/multicast
+	doins *.sh
+}
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
new file mode 100644
index 000000000000..6964b4f3e779
--- /dev/null
+++ b/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
@@ -0,0 +1,26 @@
+diff -ru dvbstream-orig/dvbstream.c dvbstream/dvbstream.c
+--- dvbstream-orig/dvbstream.c	2008-05-16 18:23:03.023540289 +0200
++++ dvbstream/dvbstream.c	2008-05-16 18:25:32.293536581 +0200
+@@ -929,6 +929,7 @@
+ 
+   if (argc==1) {
+     fprintf(stderr,"Usage: dvbtune [OPTIONS] pid1 pid2 ... pid8\n\n");
++    fprintf(stderr,"-tp         TELNET port\n");
+     fprintf(stderr,"-i          IP multicast address\n");
+     fprintf(stderr,"-r          IP multicast port\n");
+     fprintf(stderr,"-net ip:prt IP address:port combination to be followed by pids list. Can be repeated to generate multiple RTP streams\n");
+@@ -1079,6 +1080,12 @@
+         LOF2=atoi(argv[i]);
+         LOF2*=1000UL;
+       }
++#ifdef ENABLE_TELNET
++      else if (strcmp(argv[i],"-tp")==0) {
++        i++;
++	port=atoi(argv[i]);
++      }
++#endif
+       else if (strcmp(argv[i],"-s")==0) {
+         i++;
+         srate=atoi(argv[i])*1000UL;
+Nur in dvbstream: dvbstream.c.orig.
+Nur in dvbstream: dvbstream.c.rej.