r2974 - in vdr/vdr-plugin-xine/branches/network/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Thu Jun 22 22:02:53 UTC 2006
Author: tiber-guest
Date: 2006-06-22 22:02:52 +0000 (Thu, 22 Jun 2006)
New Revision: 2974
Modified:
vdr/vdr-plugin-xine/branches/network/debian/changelog
vdr/vdr-plugin-xine/branches/network/debian/control
vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
Log:
- build-depend on vdr 1.4.1
- Modified network patch to configure sockets with option
TCP_NODELAY to work around problems with the new buffer monitoring
algorithm
Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog 2006-06-21 22:26:22 UTC (rev 2973)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog 2006-06-22 22:02:52 UTC (rev 2974)
@@ -1,3 +1,13 @@
+vdr-plugin-xine (0.7.9-2net2) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr-dev (>=1.4.1-1)
+ - Modified network patch to configure sockets with option
+ TCP_NODELAY to work around problems with the new buffer monitoring
+ algorithm
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 22 Jun 2006 23:59:18 +0200
+
vdr-plugin-xine (0.7.9-2net1) unstable; urgency=low
* Tobias Grimm <tg at e-tobi.net>
Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control 2006-06-21 22:26:22 UTC (rev 2973)
+++ vdr/vdr-plugin-xine/branches/network/debian/control 2006-06-22 22:02:52 UTC (rev 2974)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.1.1-1vdr1), vdr-dev (>=1.4.0-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.1.1-1vdr1), vdr-dev (>=1.4.1-1)
Standards-Version: 3.6.2
Package: vdr-plugin-xine
Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2006-06-21 22:26:22 UTC (rev 2973)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2006-06-22 22:02:52 UTC (rev 2974)
@@ -1,15 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_network.dpatch by Tobias Grimm <tg at e-tobi.net>
+## 03_network.dpatch by Peter Weber <peter_weber69 at gmx.at>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This patch allows to provide a vdr stream via a
## DP: sockets interface This patch is based on Peter Webers
## DP: xine-0-7-7-network.
+## DP:
+## DP: Modifications:
+## DP: [2006-06-18] Tobias Grimm <tg at e-tobi.net>
+## DP: - configure sockets with TCP_NODELAY to workaround problems with
+## DP: the new buffer monitoring algorithm in vdr-xine
@DPATCH@
-diff -Nru xine-0.7.7.orig/xine.c xine-0.7.7/xine.c
---- xine-0.7.7.orig/xine.c 2006-01-15 00:47:12.000000000 +0100
-+++ xine-0.7.7/xine.c 2006-02-20 17:36:48.000000000 +0100
+diff -urNad vdr-plugin-xine-0.7.9~/xine.c vdr-plugin-xine-0.7.9/xine.c
+--- vdr-plugin-xine-0.7.9~/xine.c 2006-06-22 23:57:47.000000000 +0200
++++ vdr-plugin-xine-0.7.9/xine.c 2006-06-22 23:57:47.000000000 +0200
@@ -33,7 +33,7 @@
public:
@@ -19,7 +24,7 @@
cPluginXine(void);
virtual ~cPluginXine();
-@@ -56,7 +56,7 @@
+@@ -65,7 +65,7 @@
, m_remote(0)
, m_remoteOn(false)
, m_xineLib(0)
@@ -28,7 +33,7 @@
{
// Initialize any member variables here.
// DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
-@@ -73,7 +73,7 @@
+@@ -82,7 +82,7 @@
//Return a string that describes all known command line options.
//" - -- x \n"
return
@@ -36,8 +41,8 @@
+ " -i ip ip address to bind to\n"
" -q turn off debug messages on console\n"
" -r turn on remote (pressing keys in xine controls VDR)\n"
- " -s switch to curses skin, while xine is disconnected\n"
-@@ -93,11 +93,9 @@
+ #if APIVERSNUM >= 10320
+@@ -106,11 +106,9 @@
{
case 'i':
{
@@ -51,7 +56,7 @@
}
break;
-@@ -203,9 +201,9 @@
+@@ -259,9 +257,9 @@
namespace PluginXine
{
@@ -63,10 +68,30 @@
}
cXineLib *&GetXineLib(cPlugin *const plugin)
-diff -Nru xine-0.7.7.orig/xineLib.c xine-0.7.7/xineLib.c
---- xine-0.7.7.orig/xineLib.c 2006-02-12 22:36:48.000000000 +0100
-+++ xine-0.7.7/xineLib.c 2006-02-20 18:06:02.000000000 +0100
-@@ -1847,7 +1847,7 @@
+diff -urNad vdr-plugin-xine-0.7.9~/xineDevice.c vdr-plugin-xine-0.7.9/xineDevice.c
+--- vdr-plugin-xine-0.7.9~/xineDevice.c 2006-06-22 23:57:43.000000000 +0200
++++ vdr-plugin-xine-0.7.9/xineDevice.c 2006-06-22 23:58:03.000000000 +0200
+@@ -8,7 +8,6 @@
+ #include "xineOsd.h"
+ #include "xineSettings.h"
+
+-
+ //#define LOG_ME(x) x
+ #define LOG_ME(x)
+
+diff -urNad vdr-plugin-xine-0.7.9~/xineLib.c vdr-plugin-xine-0.7.9/xineLib.c
+--- vdr-plugin-xine-0.7.9~/xineLib.c 2006-06-22 23:57:43.000000000 +0200
++++ vdr-plugin-xine-0.7.9/xineLib.c 2006-06-22 23:58:24.000000000 +0200
+@@ -8,6 +8,8 @@
+ #include "xineOsd.h"
+ #include "xineSettings.h"
+
++#include <netinet/tcp.h>
++
+
+
+ #define ASSERT_PALETTE(x)
+@@ -1983,7 +1985,7 @@
#endif
@@ -75,7 +100,7 @@
extern cXineLib *&GetXineLib(cPlugin *const plugin);
cXineLib::cXineLib(cPlugin *const plugin, const cXineSettings &settings, cMutex &osdMutex, cXineRemote *const remote)
-@@ -1855,6 +1855,10 @@
+@@ -1991,6 +1993,10 @@
, m_plugin(plugin)
, m_settings(settings)
, m_osdFlushRequired(false)
@@ -86,7 +111,7 @@
, fd_fifo0(-1)
, fd_result(-1)
, fd_control(-1)
-@@ -1873,14 +1877,9 @@
+@@ -2009,14 +2015,9 @@
{
m_fifoDir = FIFO_DIR;
@@ -104,7 +129,7 @@
m_fifoNameControl = m_fifoDir + "/stream.control";
m_fifoNameResult = m_fifoDir + "/stream.result";
m_fifoNameRemote = m_fifoDir + "/stream.event";
-@@ -1962,9 +1961,37 @@
+@@ -2098,9 +2099,44 @@
m_eventSink = eventSink;
}
@@ -112,6 +137,7 @@
+ {
+ int fd;
+ int onoff = 1;
++ int setsockoptFlag = 1;
+ struct sockaddr_in sain;
+
+ if ((fd = ::socket(PF_INET,SOCK_STREAM,0)) < 0) {
@@ -119,6 +145,12 @@
+ return -1;
+ }
+
++ if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
++ (const char *)&setsockoptFlag, sizeof(int)) < 0) {
++ perror("setsockopt failed.");
++ return -1;
++ }
++
+ sain.sin_addr.s_addr = m_bindIp;
+ sain.sin_port = htons(port);
+
@@ -143,7 +175,7 @@
::unlink(m_fifoNameExtResult.c_str());
::unlink(m_fifoNameControl.c_str());
::unlink(m_fifoNameResult.c_str());
-@@ -2003,6 +2030,26 @@
+@@ -2139,6 +2175,26 @@
#undef MkFifo
::umask(origUmask);
@@ -170,7 +202,7 @@
if (!Start())
return false;
-@@ -2028,13 +2075,18 @@
+@@ -2164,13 +2220,18 @@
disconnect();
}
@@ -191,7 +223,7 @@
}
void cXineLib::internalPaused(const bool paused)
-@@ -2286,6 +2338,28 @@
+@@ -2423,6 +2484,28 @@
// fprintf(stderr, "Action done\n");
}
@@ -220,7 +252,7 @@
bool cXineLib::checkXineVersion()
{
int32_t version = 0;
-@@ -2306,7 +2380,8 @@
+@@ -2443,7 +2526,8 @@
// if (-1 == fd_fifo0)
// {
@@ -230,7 +262,7 @@
if (-1 == fd_fifo0)
return false;
-@@ -2321,6 +2396,23 @@
+@@ -2458,6 +2542,23 @@
::fcntl(fd_fifo0 , F_SETFL, ~O_NONBLOCK & ::fcntl(fd_fifo0 , F_GETFL, 0));
::fcntl(fd_remote, F_SETFL, ~O_NONBLOCK & ::fcntl(fd_remote, F_GETFL, 0));
@@ -254,9 +286,9 @@
internalPaused(false);
-diff -Nru xine-0.7.7.orig/xineLib.h xine-0.7.7/xineLib.h
---- xine-0.7.7.orig/xineLib.h 2006-02-03 22:16:46.000000000 +0100
-+++ xine-0.7.7/xineLib.h 2006-02-20 17:36:48.000000000 +0100
+diff -urNad vdr-plugin-xine-0.7.9~/xineLib.h vdr-plugin-xine-0.7.9/xineLib.h
+--- vdr-plugin-xine-0.7.9~/xineLib.h 2006-06-22 23:57:43.000000000 +0200
++++ vdr-plugin-xine-0.7.9/xineLib.h 2006-06-22 23:57:47.000000000 +0200
@@ -88,6 +88,7 @@
string m_fifoNameStream;
string m_fifoNameExtControl;
@@ -265,7 +297,7 @@
private:
cPlugin *const m_plugin;
-@@ -137,7 +138,13 @@
+@@ -140,7 +141,13 @@
}
private:
More information about the pkg-vdr-dvb-changes
mailing list