r2426 - in vdr/vdr-plugin-streamdev/trunk/debian: . patches
Thomas Günther
tom-guest at costa.debian.org
Wed Apr 19 17:04:15 UTC 2006
Author: tom-guest
Date: 2006-04-19 17:04:14 +0000 (Wed, 19 Apr 2006)
New Revision: 2426
Added:
vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch
Modified:
vdr/vdr-plugin-streamdev/trunk/debian/changelog
vdr/vdr-plugin-streamdev/trunk/debian/control
vdr/vdr-plugin-streamdev/trunk/debian/copyright
vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
Log:
Added 92_streamdev-csv-vdr-1.3.47.dpatch
Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog 2006-04-19 15:42:47 UTC (rev 2425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog 2006-04-19 17:04:14 UTC (rev 2426)
@@ -1,3 +1,14 @@
+vdr-plugin-streamdev (0.3.1+cvs20050522-19) unstable; urgency=low
+
+ * NOT RELEASED YET
+
+ * Thomas Günther <tom at toms-cafe.de>
+ - Build-Depend on vdr-dev (>= 1.3.47-1)
+ - Added 92_streamdev-csv-vdr-1.3.47.dpatch
+ - Shortened debian/copyright
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 19 Apr 2006 02:13:46 +0200
+
vdr-plugin-streamdev (0.3.1+cvs20050522-18) unstable; urgency=low
* Thomas Schmidt <tschmidt at debian.org>
Modified: vdr/vdr-plugin-streamdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/control 2006-04-19 15:42:47 UTC (rev 2425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/control 2006-04-19 17:04:14 UTC (rev 2426)
@@ -3,12 +3,12 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Peter Siering <ps at ctmagazin.de>, Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.3.46-1), dpatch (>=2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.47-1), dpatch (>= 2.0.9)
Standards-Version: 3.6.2
Package: vdr-plugin-streamdev-client
Architecture: any
-Depends: ${vdr:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${vdr:Depends}
Conflicts: vdr-plugin-streamdev, ${vdr:Conflicts}
Replaces: vdr-plugin-streamdev
Description: Plugin to vdr that lets the software play streams
@@ -20,7 +20,7 @@
Package: vdr-plugin-streamdev-server
Architecture: any
-Depends: ${vdr:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${vdr:Depends}
Conflicts: vdr-plugin-streamdev, ${vdr:Conflicts}
Replaces: vdr-plugin-streamdev
Description: Plugin to vdr that lets the software stream
Modified: vdr/vdr-plugin-streamdev/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/copyright 2006-04-19 15:42:47 UTC (rev 2425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/copyright 2006-04-19 17:04:14 UTC (rev 2426)
@@ -7,20 +7,5 @@
Copyright:
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- see /usr/share/common-licenses/GPL
-
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2006-04-19 15:42:47 UTC (rev 2425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2006-04-19 17:04:14 UTC (rev 2426)
@@ -1,2 +1,4 @@
01_Makefile-fPIC-fix
+
91_cvs-20051209
+92_streamdev-csv-vdr-1.3.47
Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch 2006-04-19 15:42:47 UTC (rev 2425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch 2006-04-19 17:04:14 UTC (rev 2426)
@@ -0,0 +1,205 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_streamdev-csv-vdr-1.3.47.dpatch by Hulk at vdrportal.de
+## http://vdr-portal.de/board/thread.php?postid=453422#post453422
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.47, add option for externremux.sh.
+
+ at DPATCH@
+Index: i18n.c
+===================================================================
+RCS file: /var/cvsroot/streamdev/i18n.c,v
+retrieving revision 1.3
+diff -u -r1.3 i18n.c
+--- streamdev-csv/i18n.c 10 May 2005 21:02:24 -0000 1.3
++++ streamdev-csv/i18n.c 17 Apr 2006 16:29:10 -0000
+@@ -807,5 +807,25 @@
+ "" // Russian
+ #endif
+ },
++ { "Streaming TV", // English
++ "Streaming TV",// Deutsch
++ "", // Slovenski
++ "", // Italiano
++ "", // Nederlands
++ "", // Português
++ "", // Français
++ "", // Norsk
++ "", // suomi
++ "", // Polski
++ "", // Español
++ "", // Ellinika
++ "", // Svenska
++ "", // Romaneste
++ "", // Magyar
++ "", // Catala
++#if VDRVERSNUM >= 10300
++ "" // Russian
++#endif
++ },
+ { NULL }
+ };
+Index: streamdev-server.c
+===================================================================
+RCS file: /var/cvsroot/streamdev/streamdev-server.c,v
+retrieving revision 1.2
+diff -u -r1.2 streamdev-server.c
+--- streamdev-csv/streamdev-server.c 9 May 2005 20:22:29 -0000 1.2
++++ streamdev-csv/streamdev-server.c 17 Apr 2006 16:29:10 -0000
+@@ -6,10 +6,12 @@
+ * $Id: 92_streamdev-csv-vdr-1.3.47.dpatch,v 1.1 2006/04/19 13:52:15 vdrtom Exp $
+ */
+
++#include <getopt.h>
+ #include "streamdev-server.h"
+ #include "server/setup.h"
+ #include "server/server.h"
+ #include "server/suspend.h"
++#include "remux/extern.h"
+ #include "i18n.h"
+
+ const char *cPluginStreamdevServer::DESCRIPTION = "VDR Streaming Server";
+@@ -27,6 +29,36 @@
+ return tr(DESCRIPTION);
+ }
+
++const char *cPluginStreamdevServer::CommandLineHelp(void)
++{
++ static char *help_str=0;
++
++ free(help_str); // for easier orientation, this is column 80|
++ asprintf(&help_str," -r CMD, --remux=CMD use CMD to remux stream\n"
++ " (default: \"%s\")\n",
++ g_szRemuxScript
++ );
++ return help_str;
++}
++
++bool cPluginStreamdevServer::ProcessArgs(int argc, char *argv[])
++{
++ static struct option long_options[] = {
++ { "remux", required_argument, NULL, 'r' },
++ { NULL }
++ };
++
++ int c, option_index = 0;
++ while((c=getopt_long(argc,argv,"r:",long_options,&option_index))!=-1) {
++ switch (c) {
++ case 'r': g_szRemuxScript=optarg;break;
++ default: return false;
++ }
++ }
++ return true;
++}
++
++
+ bool cPluginStreamdevServer::Start(void)
+ {
+ i18n_name = Name();
+@@ -55,9 +87,13 @@
+ cStreamdevServer::Destruct();
+ }
+
+-bool cPluginStreamdevServer::Active(void)
++cString cPluginStreamdevServer::Active(void)
+ {
+- return cStreamdevServer::Active();
++ if(cStreamdevServer::Active())
++ {
++ return tr("Streaming TV");
++ }
++ return NULL;
+ }
+
+ const char *cPluginStreamdevServer::MainMenuEntry(void)
+Index: streamdev-server.h
+===================================================================
+RCS file: /var/cvsroot/streamdev/streamdev-server.h,v
+retrieving revision 1.2
+diff -u -r1.2 streamdev-server.h
+--- streamdev-csv/streamdev-server.h 9 May 2005 20:22:29 -0000 1.2
++++ streamdev-csv/streamdev-server.h 17 Apr 2006 16:29:10 -0000
+@@ -21,11 +21,14 @@
+ virtual const char *Description(void);
+ virtual bool Start(void);
+ virtual void Stop(void);
+- virtual bool Active(void);
++ virtual cString Active(void);
+ virtual const char *MainMenuEntry(void);
+ virtual cOsdObject *MainMenuAction(void);
+ virtual cMenuSetupPage *SetupMenu(void);
+ virtual bool SetupParse(const char *Name, const char *Value);
++
++ virtual bool ProcessArgs(int argc, char *argv[]);
++ virtual const char *CommandLineHelp(void);
+ };
+
+ #endif // VDR_STREAMDEVSERVER_H
+Index: remux/extern.c
+===================================================================
+RCS file: /var/cvsroot/streamdev/remux/extern.c,v
+retrieving revision 1.1
+diff -u -r1.1 extern.c
+--- streamdev-csv/remux/extern.c 12 Feb 2005 17:20:35 -0000 1.1
++++ streamdev-csv/remux/extern.c 17 Apr 2006 16:29:10 -0000
+@@ -3,6 +3,9 @@
+ #include <vdr/tools.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <wait.h>
++
++const char *g_szRemuxScript = "externremux.sh";
+
+ class cTSExt: public cThread {
+ private:
+@@ -10,7 +13,6 @@
+ bool m_Active;
+ int m_Process;
+ int m_Inpipe, m_Outpipe;
+-
+ protected:
+ virtual void Action(void);
+
+@@ -47,6 +49,7 @@
+ }
+
+ if (m_Process == 0) {
++
+ // child process
+ dup2(inpipe[0], STDIN_FILENO);
+ close(inpipe[1]);
+@@ -57,9 +60,7 @@
+ for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
+ close(i); //close all dup'ed filedescriptors
+
+- printf("starting externremux.sh\n");
+- execl("/bin/sh", "sh", "-c", "/root/externremux.sh", NULL);
+- printf("failed externremux.sh\n");
++ execl("/bin/sh", "sh", "-c", g_szRemuxScript, NULL);
+ _exit(-1);
+ }
+
+@@ -77,6 +78,7 @@
+ close(m_Outpipe);
+ close(m_Inpipe);
+ kill(m_Process, SIGTERM);
++ waitpid(m_Process, 0, 0);
+ }
+
+ void cTSExt::Action(void)
+Index: remux/extern.h
+===================================================================
+RCS file: /var/cvsroot/streamdev/remux/extern.h,v
+retrieving revision 1.1
+diff -u -r1.1 extern.h
+--- streamdev-csv/remux/extern.h 12 Feb 2005 17:20:35 -0000 1.1
++++ streamdev-csv/remux/extern.h 17 Apr 2006 16:29:10 -0000
+@@ -4,6 +4,8 @@
+ #include "remux/tsremux.h"
+ #include <vdr/ringbuffer.h>
+
++extern const char *g_szRemuxScript;
++
+ class cTSExt;
+
+ class cExternRemux: public cTSRemux {
More information about the pkg-vdr-dvb-changes
mailing list